Merge branch 'master' into bootstrap
Merge branch 'bootstrap' of github.com:catarse/catarse into submit-project