Merge branch '2013-6-3_params'
Merge branch 'master' of git@github.com:smartcampuslab/smartcampus.vas.discovertrento.android.git