Project Pages
Merge branch 'develop' of https://github.com/shsu/comp4911 into develop

Conflicts:
	src/main/webapp/index.html
	src/main/webapp/js/min/controllers.min.js