--
Merge branch 'master' into newy

Conflicts:
	.idea/workspace.xml