merging with master
merging with master
merging with master stage 2
General GUI improvments
Merge remote-tracking branch 'origin/webdesign'
Bug fixes