Merge branch 'development' of https://github.com/miguelhitavicente81/Manhattan into miguelhitavicente81-development

Conflicts:
	es/home/editCurCV.php
	es/upload.php

Solved.