fix conflict with bootstrap tab
Merge pull request #333 from zhulin3141/master

fix conflict with bootstrap tab