constant

constant
a Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/constants.php