Fix constant issues
Fix constant issues
Fix constant issues
Merge branch 'master' of heroku.com:fieldtrip-it