commit
Merge remote-tracking branch 'origin/master'

* origin/master:
  Merge commit

Conflicts:
	.idea/workspace.xml