imports changed for bootstrap 3.2.0

if we do not include bootstrap-sprockets glyphicons will not be present
Merge branch 'master' into develop

* master:
  imports changed for bootstrap 3.2.0