on going home user
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	index.php
	protected/config/main.php