Merge branch 'feature/twitter-bootstrap-2'