First commit
Second commit

Fixed:
home
admin menu
Merge branch 'master' of ssh://cloudcontrolled.com/repository

Conflicts:
	index.php