Locale
Merge branch 'master' of github.com:extreme-fusion/eXtreme-Fusion-CMS

Conflicts:
	admin/templates/pages.tpl