small changes
Properties file change
Merge branch 'master' of https://github.com/bwalker99/LTIForward

Conflicts:
	bin/ca/ubc/med/sample/Login.class
	resources/LTIForward.properties

catchup