Merge branch 'develop'
constants.__init__ slipped through
implementing gui
Merge branch 'master' into develop