Merge origin/master

Conflicts:
	src/main/webapp/resources/css/bootstrap.css
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/EJBs/LoginCheckEjb.java