Merge pull request #3 from freddylimpens/master

wired file-preview + fix file-upload view
wired labellisation overlay