Merge branch 'develop' into staging

Conflicts:
	.idea/workspace.xml
switching to subl