Added filebrowser to allow image uploads
Merge branch 'inlineimg'