update for Twitter Bootstrap 3
Merge branch 'richardpeng-feature/bootstrap3'

* richardpeng-feature/bootstrap3:
  update for Twitter Bootstrap 3