Merge branch 'release/1.0' into develop
updating poms for 1.1-SNAPSHOT development
Procfile
Adding Java 7 support
add proc file
Merge branch 'develop'
revert pom version in master to released