Points system updated
Merge branch 'user-badges'
Recommend Resit icon fixed