Conflicts:

	htdocs/lib/db/upgrade.php

Correct the path to the view layout preview thumbnails, so it works when Mahara is installed in a subdirectory.

Conflicts:

	htdocs/lib/form/elements/userlist.php

Firstly, an over-enthusiastic optimisation I was responsible for broke the replacement of downloadtemp images, especially on sites which are not installed at the root of a domain. Then, some greedy regexes meant that if there was more than one image in the post, only one of them would have the URL fixed properly. The same bug was happening again when posts were being displayed in views.

This patch fixes these problems, and contains a blog database upgrade to fix existing broken paths.

for register, login, forgotten password, contact

Respect the system include path. This allows system versions of libraries to be used if Mahara doesn't include them - e.g. when being debian packaged.

adding confirm dialog to cancel with new view, and cancelling now deletes the partially created view