varios
cambio
Merge branch 'master' of https://github.com/fernandoguirao/joinity.git

Conflicts:
	templates/pages/joinities/shoppings/all-shoppings-page/index.jade
	templates/pages/user/profile/edit/mainContent.jade
	templates/pages/user/profile/leftColumn.jade