web middle
Merge branch 'middle'

Conflicts:
	website/TODO
	website/protected/views/layouts/admin.php
	website/protected/views/layouts/main.php