Risolto problema altezza
Merge branch 'master' of https://github.com/ArtoAle/sherpa

Conflicts:
	app/scripts/mysherpa.js