Bumpdiebump
Prevent preview button from going to homepage in case of js errors.
Prevent preview button from going to homepage in case of js errors.
Merge branch 'release-1.1' into theme-modx

Conflicts:
	_build/build.transport.php