added a bunch of database stuff
Merge branch 'master' of https://github.com/nmargie/DRUMotion

Conflicts:
	src/Progress.java