Updated .gitignore
fixed segfault when home directory doesn't exist
Merge remote-tracking branch 'pasis/iss270'
Added tests for contact type
Refactored contact display string
Added contact presence offline test
Added contact tests
Merge branch 'master' into otr

Conflicts:
	.gitignore