Fix DB
Merge branch 'master' of https://github.com/johnscheible/Velcro

Conflicts:
	src/com/mwm/velcro/MAKr.java