Added .DS_Store to .gitignore
Added Piface watchdog
Merge branch 'sumnerboy12-piface'

Conflicts:
	distribution/openhabhome/configurations/openhab_default.cfg
Merge remote-tracking branch 'upstream/master'