cfgh
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebCodingtonPortal/WebContent/profileAdmin.jsp
	WebCodingtonPortal/WebContent/registerPlace.jsp
xcv