commit
Merge branch 'master' of https://github.com/bloomweb/eximia

Conflicts:
	source/sites/default/settings.php