24_1
Merge branch 'master' of https://github.com/Eldamartwilight/ecocompany

Conflicts:
	css/app.css
	protected/views/layouts/main_bootstrap_3.php
	protected/views/site/index.php