Merge pull request #24 from jschneider/develop

fixed minor issues: reformatted code / optimized imports / moved test.html
added prerequisites for maven 3.1.1 (fixes #23)