file update
now linked to local copy of ionic framework files (v1.0.0-beta4-nightly-2035)
index file updated  to work with local ionic framework copy
made old map controllers work after last huge refactoring
now auto-syncing every 10 days
added *content* localization based on user device language
misc minor fixes
added home page carousel (with hardwired demo data)
Merge commit '496d8d7b7f6deed71524f2fba2ef3e19ba588bb1'

* commit '496d8d7b7f6deed71524f2fba2ef3e19ba588bb1':
  Introducing Google Maps v3 with angular-google-maps (http://angular-google-maps.org)

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/css/style.css
	smartcampus.vas.comuneintasca.mobile/www/index.html
Merge commit '7f077c4bc4bbd7428f58952d1228b9b7bfd4d6d1'

* commit '7f077c4bc4bbd7428f58952d1228b9b7bfd4d6d1':

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/css/style.css
	smartcampus.vas.comuneintasca.mobile/www/index.html
Merge commit '31b54dfa49a1a8a970c3c78cc7d62dc3c77eefce'

* commit '31b54dfa49a1a8a970c3c78cc7d62dc3c77eefce':
  Code formatting.

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/js/controllers.js
Merge commit '26df11c61a2019023bb192fb8fc00e104331ec57'

* commit '26df11c61a2019023bb192fb8fc00e104331ec57':
  main events added
Merge commit '79c95d79136492b80a2cab2177800fd39863d733'

* commit '79c95d79136492b80a2cab2177800fd39863d733':
  Itineraries
Merge branch 'master' of https://github.com/smartcampuslab/comuneintasca

# By o.zambotti
# Via o.zambotti
* 'master' of https://github.com/smartcampuslab/comuneintasca:
  Polylines for itineraries (not on the streets, working on it)