Changed routes controller and model

model: new db fields
controller: added comments

2 files deleted. wrong files
users file push
Merge branch 'master' of https://github.com/sjorsroelofs/cria-ov-wise

Conflicts:
	server/app/controllers/badges.js