Welcome to the Hell.
Merge branch '2013-06-11_crazy_week' of git@github.com:smartcampuslab/android.discovertrento.lib.git into 2013-06-11_crazy_week

Conflicts:
	src/eu/trentorise/smartcampus/dt/fragments/pois/PoiDetailsFragment.java