Removed .iml files
Updated .gitignore
Merge branch 'master' into maven