ignore
Changed pom.xml to include junit, fixed classpath to not include junit. changed modal on userarea query builder to use the bootstrap modal.
Merge branch 'feature/restrictuser' of github.com:hillst/PhenoFront into feature/restrictuser

Conflicts:
	User Profile and Authentication Seed.sql
	src/main/webapp/WEB-INF/views/userarea-querybuilder.jsp