commit
Merge branch 'dist' of https://github.com/jaylim/amlm into layout

Conflicts:
	protected/views/site/announcement.php
update few pages