Merge project2 to master.
Merge branch 'master' of
https://github.com/scottmo/CSE135WebAppProject.git

Conflicts:
	cse135/WebContent/SalesAnalytics.jsp
	cse135/WebContent/index.jsp
	cse135/db/db.sql
	cse135/db/salesAnalytics.sql
	cse135/src/datagen/DataGeneratorBulk.java