final deploy
Merge branch 'master' of https://github.com/nyantunzaw/teamonepiece

Conflicts:
	createModule.html
	createQuiz.html
	css/custombootstrap.css
	css/orbit-1.2.3.css
	data/barData0.tsv
	data/barData1.tsv
	data/barData2.tsv
	data/pieData1.csv
	data/pieData2.csv
	defaultPage.html
	editModule.html
	login.jsp
	loginRedirector.java
	takeModule.html
	takeQuiz.html
	traineeViewModuleC.html
	traineeViewModuleP.html
	trainerViewModule.html
	viewAnalytics.html