Merge pull request #818 from Foxaii/BS3

Bootstrap 3 RC1