Add pom.xml to work using maven.
change .gitignore
Merge branch 'develop'