updates to latest master
merges conflicts

Conflicts:
	shared/services/RenderService.js