tiny change only
Do merge
Merge branch 'master' of https://github.com/huze0001/artutor.sg

Conflicts:
	protected/views/site/index.php
	protected/views/site/login.php