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

Conflicts:
	app/controllers/AccountController.php
	app/controllers/AnggotaController.php
	app/views/includes/header.blade.php
Merge branch 'master' of https://github.com/raymondchandra/hfi