refactored gui, scenes
everything out of controller, into service
Merge branch 'get-scenes-out-of-controller'
Merge branch 'master' into gh-pages