Merge pull request #1 from arcaneadam/7.x-dev

LDC-242 & LDC-243 Gamification
Adding the userpoints module into the make file