moved city name-dependent constants to conf.js
Merge branch 'dynamic-structure' of https://github.com/smartcampuslab/comuneintasca into dynamic-structure

# By raman
# Via raman
* 'dynamic-structure' of https://github.com/smartcampuslab/comuneintasca:
  moved city name-dependent constants to conf.js

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/data/trento.json
Merge commit '0148d1da821e6ff233adc6d1af8fffba3bd0d6d8' into ricadi

* commit '0148d1da821e6ff233adc6d1af8fffba3bd0d6d8':
  moved city name-dependent constants to conf.js

Conflicts:
	smartcampus.vas.comuneintasca.mobile/www/js/services/conf.js
	smartcampus.vas.comuneintasca.mobile/www/main.html