Merge branch 'release/1.1.0,4' into develop
upped version of bootstrap to 2.3.2 and fontawesome to 3.2.1
bump
Merge branch 'release/1.1.0.5'