Merge
Merge branch 'master' of github.com:smartcampuslab/smartcampus.vas.discovertrento.android