Merge pull request #7 from bripkens/master

CORS support and more JSON services
README
Make it Java 6 compatible
Procfile for Heroku deployment
heroku should use Java 7
Necessary changes for Heroku deployment.