intentando el click
Merge branch 'feature/Click_on_Market' into develop

Conflicts:
	war/css/style.css
	war/js/functions.js