admin locator, about, contact, half user
Merge branch 'master' of https://github.com/StephanusJeffry/frunk

Conflicts:
	app/routes.php
	app/storage/logs/laravel.log
	app/storage/views/14a793130e09d9ec3ca7c620bfd7aed2
	app/storage/views/97e44f129e420fbc86789e8236f6eb62
	app/storage/views/eb95ac36b85696484a8aef08c359cd64