Manifest aligned to new Discover Trento theme
New branch
New branch
Merge branch '2013-06-11_crazy_week' of
git@github.com:smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git
into 2013-06-11_crazy_week
Merge branch 'master' into 2013-06-11_crazy_week
point to the dev
Merged
Merge branch '2013-06-11_crazy_week' of git@github.com:smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git into 2013-06-11_crazy_week

Conflicts:
	res/values/apps.xml
Inactive options in Broadcast notifications are now hidden; added new
activity in the manifest
new params (default and event) loaded by default
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git into 2013-06-11_crazy_week
New local timetables
New default params
Merge
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git into 2013-06-11_crazy_week
manifest
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git into 2013-06-11_crazy_week
Disable update with our server
Added some preferences for tutorials.
Point to prod server
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/smartcampus.vas.vivitrento.android.unified_apps.git into 2013-06-11_crazy_week