updated glyphicon layout
fixe conflicts on merge
Merge branch 'authenticate' into herokuprod