added tests for ContactTypeParser
Merge branch 'master' of github.com:fomaa/Calendar