kb
Merge branch 'development' of https://github.com/araquach/paulkemp2 into development

Conflicts:
	protected/views/layouts/main.php
	protected/views/site/pages/offers.php