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

Conflicts:
	source/sites/all/themes/custom/css/pages.css