Version bump.
Merge branch 'release/v2.1.0' into develop
Downgraded to JDK6.
Added Procfile for Heroku.