1.0.3 .idea folder removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/generator-frontster.iml
	.idea/inspectionProfiles/Project_Default.xml
	.idea/inspectionProfiles/profiles_settings.xml