Owner
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	protected/views/adminhome/index.php
owner site