Merge remote-tracking branch 'origin/schemr'

Conflicts:
	.idea/workspace.xml