Add .idea/workspace.xml instead of full .idea directory
Single folder for META-INF files
Fix project settings
Merge branch 'master' into stupid