Ignore idea files
Merge branch 'trunk'