move to gitlab - internal
Merge branch 'master' of https://github.com/bwalker99/FoM

Conflicts:
	fom-idm/.gitignore
	fom-idm/build.properties
	fom-idm/build/ca/ubc/med/idm/Login.class
	fom-idm/build/ca/ubc/med/idm/MedicolReportLister.class
	fom-idm/build/ca/ubc/med/idm/MedicolUserUpdate.class
	fom-idm/build/ca/ubc/med/idm/data/MedicolUserHelper.class
	fom-idm/dist/fomidm.war
	fom-idm/resources/_header.jspf
	fom-idm/resources/fom-idm-new.sql
	fom-idm/resources/fomidm-Urls.properties
	fom-idm/resources/fomidm.properties
	fom-idm/resources/main.jsp
	fom-idm/src/ca/ubc/med/idm/Controller.java
	fom-idm/src/ca/ubc/med/idm/Login.java
	fom-idm/src/ca/ubc/med/idm/MedicolUserUpdate.java
	fom-idm/src/ca/ubc/med/mvc/SessionController.java

fix