.ignore file adjusted for idea *.iml files.
Merge remote-tracking branch 'origin/master'