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