removed user_test
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
upgrade Font-Awsome from 3 to 4