fix tbar build
Merge branch 'pripublic' of bitbucket.org:fenglinqing/neutube into public
Merge branch 'public' of https://github.com/janelia-flyem/NeuTu into public