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

Conflicts:
	app/views/layouts/admin.blade.php