Changed main class slightly and pointed pom.xml to the right main class
Changed pom.xml to specify JRE to run with (Java 8)
Merge branch 'dev'