Eclipse cleanup and maven build fix
Merge branch 'master' of https://github.com/eugenp/tutorials