working in bootstrap 3
Merge branch 'fix/bootstrap-3'