Merge branch 'master' of https://github.com/pjvaldez2013/mhrmp

Conflicts:
	grails-app/conf/BootStrap.groovy
Merge branch 'master' of https://github.com/pjvaldez2013/mhrmp