Merge branch 'webapp' of github.com:smoussa/codeforgood into webapp

Conflicts:
	admin/application/config/database.php
commit conflict

autoloading more libraries
merge conflicts