add bootstrap switch
Merge branch 'develop'