vcxv
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebCodingtonPortal/WebContent/WEB-INF/properties.xml
Merge branch 'master' of ssh://git@github.com/NewCodington/CodingtonFinalProjectPortal.git