Merge branch 'hotfix/fix_capfile' into develop
db.yaml
fixed database.yaml
Devise stuff
Merge branch 'release/0.0.3'