Fixing bug #3533

http://tracker.modx.com/issues/3533
Added ability to use custom templates to login and manager lockout pages
https://github.com/modxcms/evolution/pull/116
From Susan
Merge pull request #29 from yama/1.0.10-dmi3yy

Added ability to use custom templates to login and manager lockout pages
added to the future possibility of changing the folder manager
added to the future possibility of changing the folder manager
Revert "Added ability to use custom templates to login and manager lockout pages"

This reverts commit 1ca04cf79d42141f9949ddf7f0e5d8adff5761cf.
small fix: wrong variable
Merge pull request #30 from Jako/patch-20

small fix: wrong variable
Refactor #9760 Style issue
http://tracker.modx.com/issues/9760
define array_combine for php4
Merge pull request #33 from Jako/patch-21

define array_combine for php4
Merge pull request #32 from yama/1.0.10-dmi3yy

Refactor #9760 Style issue
Refactor #9764 german translation string: udperms_message

http://tracker.modx.com/issues/9764
Feature #9776 Adding folder urls functionality to core parser
http://tracker.modx.com/issues/9776
Merge pull request #35 from yama/master-dmi3yy

Refactor #9764 german translation string: udperms_message
fix changelog
Revert "Revert "Added ability to use custom templates to login and manager lockout pages""

This reverts commit 24d3109e61a7e54c371c7af1eb132c12fc5dbb2f.
Added ability to use custom templates to login and manager lockout pages

http://tracker.modx.com/issues/9778
Merge branch 'master' of https://github.com/Jako/evolution

Conflicts:
	assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php
Revert "define array_combine for php4"

This reverts commit ea17ad5b1a5bb38106fec79273b448d8d2a2b78f.