SWC-484 login page redirects
Merge pull request #347 from dburdick/swc-484-w

SWC-484 login page redirects
Merge branch 'release-w' into develop

Conflicts:
	src/main/java/org/sagebionetworks/web/client/mvp/AppActivityMapper.java