pull
Merge branch 'master' of https://github.com/TRWirahmana/hukor
Merge branch 'master' of https://github.com/TRWirahmana/hukor
redirect
Merge branch 'master' of https://github.com/TRWirahmana/hukor

Conflicts:
	app/controllers/PeruuController.php
resolve conflict