changes
Merge branch 'master' of https://github.com/chrisciampoli/adpoint_by_cciampoli

Conflicts:
	application/config/constants.php