Formatted pom.xml and added right credits
Merge remote-tracking branch 'origin/master'