Merge remote-tracking branch 'patrick/master'
WIP: adding atlas widget ui
Merge remote-tracking branch 'dean/master'