Fix #55, fix #56
Merge branch 'agenda' of
git@github.com:smartcampuslab/smartcampus.vas.rifiuti.android.git into
agenda

Conflicts:
	src/it/smartcampuslab/riciclo/MainActivity.java