Upgraded bootstrap to 3.2.0
Updated font-awesome to 4.2.0, compressed
Merge branch 'dev' into beta
Merge branch 'beta'