resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/codeStyleSettings.xml
	.idea/misc.xml
finish %variable changing