Upgrade to Bootstrap 3
Merge branch 'master' of git@github.com:Netsensia/directorzone.git