fixed problem with twitter bootstrap
Merge branch 'develop'
Merge branch 'obi12341/master'