idea changes
Merge branch 'master' of https://github.com/colincoghill/oasisqe

Conflicts:
	.idea/inspectionProfiles/profiles_settings.xml