Merge branch 'develop'

Conflicts:
	Barista/Info.plist