Update to bootstrap 3.3.1
Minor css update
Merge branch 'refactoring' into refactoring_sass