l
Merge branch 'master' of https://github.com/jvinceso/mpn

Conflicts:
	application/config/constants.php
Merge branch 'master' of https://github.com/jvinceso/mpn