Merge branch 'release/3.1.1.1' into develop
moved location of glyphicons
bumped to version 3.1.1.2
Merge branch 'release/3.1.1.2'