...
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/fileColors.xml
	.idea/workspace.xml