Updated readme
Merge remote-tracking branch 'origin/master' into development
Changes to gitignore and POM