Updated to bootstrap 3
Merge branch 'develop'