Possible fix for tests that rely on the ProfileController.
Merge branch 'develop' of https://github.com/alxdarksage/Bridge into develop

Conflicts:
	src/main/java/org/sagebionetworks/bridge/webapp/controllers/ProfileController.java