new territory demo
Merge branch 'resourceAuth' of
https://github.com/smartcampuslab/android.smartcampus.template.standalone.git
into resourceAuth

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
	src/eu/trentorise/smartcampus/template/MainActivity.java
New permission for maps and new new lib for maps
Merge branch 'resourceAuth' of
https://github.com/smartcampuslab/android.smartcampus.template.standalone.git
into resourceAuth

Conflicts:
	AndroidManifest.xml
	project.properties
territory demo
New manifest