Merge pull request #4 from sforce100/master

db
merge db
merge mater
Merge branch 'master' into develop

Conflicts:
	bin/classes/com/andthen/main/AndThenActivity.class
v0.1
Merge pull request #6 from PlutoDyh/master

123