Test commit
Merge branch 'dev' into beta
Test commit 2
Merge branch 'dev' into beta
Updated FontAwesome to 4.0.2
Merge branch 'beta' into dev
Updated FontAwesome to 4.0.3
Merge branch 'dev' into beta
Merge branch 'beta'