updates & fixes
Merge branch 'master' of github.com:unibz2012/db-app