Added kdiff temporary .orig to .gitignore
Merge branch 'master' into stewart

Conflicts:
	.gitignore
Merge branch 'stewart' of github.com:SafirSDK/safir_sdk_core into stewart