minor changes 3
minor changes 4
minor changes 5
Merge branch 'master' of heroku.com:codepump2
database enabled + sander's JS fix