gatau
Merge branch 'master' of github.com:ansharabdullah/RMS

Conflicts:
	application/controllers/amt.php
Merge branch 'master' of github.com:ansharabdullah/RMS
Merge branch 'master' of github.com:ansharabdullah/RMS
detil on progress