Merge pull request #587 from leider/master

Bootstrap 3.1