just another commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/logo.png
	protected/controllers/SiteController.php
almost final commit