Merge remote-tracking branch 'patrick/master'
WIP: atlas development
WIP: image atlas integration