Merge branch 'develop' of github.com:galaxy-team/saturn into develop
Cleaned up some stuff. :) (interfaces and whatnot)