Merge remote-tracking branch 'dean/master'
Putting splitter between tree and note widgets
Adding image atlas UI functionality
More work on image atlas
Updating TODO
Merge remote-tracking branch 'patrick/master'