lain, kegiatan
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/views/pages/admin/lain/lainIndex.blade.php
	vendor/autoload.php
	vendor/composer/autoload_real.php