add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add type polyline
add child element selected
fixed image url bugs
fixed image url bugs
fixed polyline bugs
fixed polyline bugs
fixed polyline bugs
fixed conflict
Merge branch 'master' into dev

Conflicts:
	app/scripts/directives/scene-element.js