now proper circles should be displayed on map
Changed some superclasses for switch and phase button
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into develop