delete ROLE_SUPERVISOR
before mixing
Merge remote-tracking branch 'kukin/master'
complete profile and change password
complete profile and change password v2
complete profile and change password v2
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp
Merge branch 'master' of https://github.com/arnulfo4jc/pharmacyApp into arnulfo4jc-master

Conflicts:
	grails-app/conf/BootStrap.groovy
Merge branch 'arnulfo4jc-master', Hay algunas mejoras que realizar, para informacion revisar los comentarios en el PR