Merge remote-tracking branch 'dean/master'
Fixing memory leak
Adding more const expressions where possible
[WIP] Separating atlas widget into its own class
Merge remote-tracking branch 'patrick/master'