program activities module
User module
Merge branch 'master' of https://github.com/KevinMarete/ADVANTECH

Conflicts:
	application/config/database.php