added extra glyphicon eye candy
Merge remote-tracking branch 'origin/association' into association