Merge remote-tracking branch 'origin/master'

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/i18n/resources-locale_default.js
	smartcampus.vas.comuneintasca.mobile/www/i18n/resources-locale_it-IT.js
Merge remote-tracking branch 'origin/master'