First
Add database support
Merging for Heroku
Merge branch 'develop' of github.com:25K/Fluent into develop
Merge branch 'develop' of github.com:25K/Fluent into develop
Merge branch 'develop' of github.com:25K/Fluent into develop
Merge branch 'develop' of github.com:25K/Fluent into develop
Merge in changes for working Heroku deploy