Merge remote-tracking branch 'origin/IntNet' into develop

Conflicts:
	.idea/workspace.xml