Merge branch 'olufemiBranch2' into develop

Conflicts:
	.gitignore
	ProManageREST/src/bu/met/cs/cs673/pm/jaxrs/resource/UserResource.java