Started XBerry stuff.
Merge branch 'master' of github.com:dezi/raspi

Conflicts:
	.gitignore
Merge branch 'master' of github.com:dezi/raspi