merge db
merge mater
Merge branch 'master' into develop

Conflicts:
	bin/classes/com/andthen/main/AndThenActivity.class
v0.1