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

Conflicts:
	project.properties