hot fixes on server
Merge branch 'bootstrap3' of https://github.com/HParker/horizon into bootstrap3