Update client bugs
Merge branch 'master' of https://github.com/falkin/OSFGamificationProject

Conflicts:
	server/REST/routes/admin/badge/badgesManage.js
ds