Merge remote-tracking branch 'origin/master'

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/css/style.css