New 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

Conflicts:
	AndroidManifest.xml