Merge branch 'master' of https://github.com/JamTeam/jam-works

Conflicts:
	.idea/workspace.xml