aggiunto
prova
Merge branch 'master' of https://github.com/StefanoVuerich/ITSCordovaApplication

Conflicts:
	AppCordova/platforms/android/assets/www/EventsDetails.html
	AppCordova/platforms/android/assets/www/index.html
	AppCordova/platforms/android/assets/www/js/Events.js
	AppCordova/platforms/android/assets/www/js/News.js
	AppCordova/platforms/android/assets/www/js/cordova-function.js
	AppCordova/platforms/android/assets/www/js/homepage.js
	AppCordova/www/EventsDetails.html
	AppCordova/www/index.html
	AppCordova/www/js/Events.js
	AppCordova/www/js/News.js
	AppCordova/www/js/cordova-function.js
	AppCordova/www/js/homepage.js