minor fix
Merge branch 'master' of https://github.com/ATnCOJunior/development

Conflicts:
	parse/cloud/views/user.ejs
	parse/public/css/atncojr.webflow.css