merge
Merge branch 'master' of
git@github.com:smartcampuslab/smartcampus.vas.rifiuti.android.git

Conflicts:
	res/layout/fragment_feedback.xml
	src/eu/trentorise/smartcampus/rifiuti/data/RifiutiHelper.java
Start tutorial
Merge branch 'master' of
git@github.com:smartcampuslab/smartcampus.vas.rifiuti.android.git

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/strings.xml