commit david 19/8/2014
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/models/Anggota.php
	app/models/Cabang.php
	app/views/pages/profileanggota.blade.php