Editor updates with color images
Merge branch 'master' of https://github.com/VSGP2014/viope_space_game.git