Fixing bug #3533

http://tracker.modx.com/issues/3533
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.
jsonDecode function decoding encoded MODX tags
- decoding is necessary because MODX tags are hexadecimal entity encoded for security reasons
Merge pull request #38 from Jako/master

jsonDecode function decoding encoded MODX tags
http://tracker.modx.com/issues/9779
fix changelog
Added ability to use custom templates to login and manager lockout pages
http://tracker.modx.com/issues/9778
https://github.com/modxcms/evolution/pull/116