working on editor ... images push
Merge branch 'develop' of https://github.com/decause/360in180 into develop