added file browser
[maintain] do some cleanup
Merge pull request #196 from haiwen/maintain_patch_1

[maintain] do some cleanup
[mac] fix ui bugs
Merge remote-tracking branch 'upstream/fbrowser' into develop
[filebrowser] part 2