no message
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/views/pages/anggota.blade.php
	app/views/pages/login.blade.php
	app/views/pages/publikasi.blade.php
Merge branch 'master' of https://github.com/raymondchandra/hfi