Merge branch 'master' into testing
Merge branch 'master' into testing

Conflicts:
	engine/URLParser.php
Merge branch 'master' of https://github.com/PITS/bluLime-CMS