Merge branch 'release/some_bugfixes' into develop
Merge branch 'hotfix/heroku_json_fix' into develop
fixed variable name typo
updated constants for spring 2014, also added some comments explaining naming scheme
Merge branch 'release/spring_2014'