bug fixes
Merge branch 'develop' of https://github.com/appdevdesigns/appdev-hris2 into develop

Conflicts:
	config/opsportal.js