test
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/android.discovertrento.lib.git into 2013-06-11_crazy_week

Conflicts:
	project.properties
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/android.discovertrento.lib.git into 2013-06-11_crazy_week
Merge branch '2013-06-11_crazy_week' of https://github.com/smartcampuslab/android.discovertrento.lib into 2013-06-11_crazy_week