Fixed problem using bootstrap <i> element
Commit, so can pull more changes that were missed last time
Merge branch 'master' of https://github.com/simax/Staff
Fixed issue with underscore