Blahahahahha
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Conflicts:
	devDb.h2.db
	devDb.lock.db
Merge branch 'master' of https://github.com/ahrekar/Simplicity

YEAAAHHH MERGING!!