Merge branch 'master' of github.com:catarse/catarse into refactor_js
Merge branch 'refactor_js' of github.com:catarse/catarse into refactor_js
adding specs to code that make rewards sortable
Merge branch 'refactor_js' of github.com:catarse/catarse into refactor_js