Add .idea folder (pre-merge)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/codeStyleSettings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml