fix for generate_url
fix for setCustomLocale #655
fixes #945
Merge branch 'master' into shawnrefactor

Conflicts:
	admin/inc/basic.php
fix for function return value
added %path% compression in getURIPath mask