Glyph icons
Merge branch 'master' of https://github.com/arkona/content
Getting rid of global user and company variables