clearing the head
Merge branch 'develop' of https://github.com/pixces/coxnkings into develop

Conflicts:
	protected/config/main.php
SCM changes