Merge pull request #1 from Terradue/develop

first merge
Update pom.xml
solved malformed pom
wrong github site
aligned template
align
Merge pull request #2 from Terradue/master

Master