1111
Merge branch 'master' of https://github.com/lucis1986/UyaWeb

Conflicts:
	application/config/database.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/InfoModule.php
1111