Add IntelliJConfiguration
Merge remote-tracking branch 'origin/master' into model

Conflicts:
	.idea/uiDesigner.xml