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

Conflicts:
	protected/controllers/SiteController.php
	protected/models/Legislation.php
	protected/models/Pages.php
	protected/models/Services.php
	protected/runtime/application.log