Merge pull request #44 from KatoStoelen/master

Match Me and People with account name and type
Merge branch 'master' of github.com:UbiCollab/UbiShare