Merge remote-tracking branch 'dean/master'
Finished putting atlas widget in its own class
Merge remote-tracking branch 'patrick/master'