finished data generation, my Oracle is messed up right now, so it needs some more testing
Merge branch 'master' of https://github.com/ddm-victor/DrexelCs500P1
Merge branch 'ddm_dev'
Generated data seems to be working now
make the header menue a little more extensible, added command line args
to deploy script for only doing java or database
Merge branch 'ddm_dev' into merge2

Conflicts:
	java/src/main/java/Sty.java
a little cleanup and refactoring for common database servlet class
fixing merge confilcts
Merge remote-tracking branch 'master' into merge2

Conflicts:
	java/src/main/java/Sty.java
Merge branch 'merge2'
undoing accedential erase of table viewer