generator changes
Merge branch 'master' of https://github.com/vqdo/cse135

Conflicts:
	src/app/shopnanza/DataGeneratorBulk.java
Merge branch 'master' of https://github.com/vqdo/cse135
timestamps