Merge branch 'develop'

Conflicts:
	.gitignore
	.idea/workspace.xml