User, tags nos users e maravilhas generalizadas.
Merge remote-tracking branch 'origin/backend' into backend

Conflicts:
	models/user.js