Insert basic bootstrap layout
Merge branch 'master' into Bootstrap

Conflicts:
	SchoolHub/pom.xml
	SchoolHub/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml