changed jump square and app type to glyph icons
pullright
fixed conflict
Merge branch 'authenticate' into herokuprod