Merge https://github.com/alxdarksage/Bridge into develop
Merge branch 'develop' of https://github.com/alxdarksage/Bridge into develop
Merge branch 'develop' of https://github.com/alxdarksage/Bridge into develop
Added sign in page.
Merge branch 'develop' of https://github.com/alxdarksage/Bridge into develop

Conflicts:
	webapp/src/main/webapp/WEB-INF/jsp/signIn.jsp
Merge pull request #3 from alxdarksage/develop

Sign in form and other starter stuff
Merge branch 'develop' of http://github.com/Sage-Bionetworks/Bridge into develop
Changing Logger class imported (the other log4j class doesn't log anything)
Intermediate attempt at pulling in dependencies
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Bridge into develop
Merge pull request #4 from marcel-blonk/develop

Intermediate attempt at pulling in dependencies
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Bridge into develop