update gitignore
update filebrowser jsp
Merge branch 'develop' into develop-apifilebrowser