contact add type, handling empty type
Merge branch 'dev-master'