Updated project for maven 3.1