Merge branch 'dev' into beta
Merge branch 'dev' into beta
Merge branch 'dev' into beta
Merge branch 'dev' into beta
Merge branch 'dev' into beta
Merge branch 'dev' into beta
Updated FontAwesome to 4.0.2
Merge branch 'beta' into dev