fixed problem with twitter bootstrap
Merge branch 'develop'