system admin updates
updated system admin
Merge branch 'develop' of https://github.com/bowlinktech/rapidregistry into feature/surveyAdmin

Conflicts:
	dbUpdates.txt
	src/main/webapp/WEB-INF/jsp/login.jsp
merged code