etrav acc update
Merge branch 'master' of github.com:Isht/etrav_acc

Conflicts:
	application/controllers/data.php
	application/models/data_model.php
	assets/js/app/controller/getGroup.js
	assets/js/app/model/GroupModel.js
	assets/js/app/store/GroupStore.js
	assets/js/app/view/group/getGroup.js
	assets/js/app/view/group/groupForm.js
	assets/js/app/view/group/groupGrid.js
	assets/js/app/view/jamaah/getJamaah.js
	assets/js/app/view/jamaah/jamaahForm.js
	assets/js/app/view/jamaah/jamaahGrid.js