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