Commit to the bone
Merge remote-tracking branch 'origin/master'

Conflicts:
	IDPSpin/.idea/workspace.xml