change rendering order of shape children
Merge branch 'client-dev' into client-dev-archive-anim. Update to camvas_renderer

* client-dev:
  change rendering order of shape children

Conflicts:
	client/data/project_rules.json
	client/data/src/client_projects.json