Merge pull request #1 from KevinMarete/master

Template Integration
User module
Merge branch 'master' of https://github.com/KevinMarete/ADVANTECH

Conflicts:
	application/config/database.php
User module
User and User Group Module
Working Parameters:Program