Added the ShapeElementView and the PhotoElementView.
re- saved the EditViewController
Merge branch 'feature/shapeElementVo' into develop