fixed 'db_reset.sh' to drop, migrate, and prepare correclty
Merge branch 'master' into rich-text
added basic cucumber tests for richtext