Update profile information
Merge branch 'master' of https://github.com/ATnCOJunior/development

Conflicts:
	parse/cloud/views/user.ejs