Changed icons etc
Merge branch 'master' of https://github.com/mockups/mockupps

Conflicts:
	protected/views/site/index.php