space design!
Merge remote-tracking branch 'origin/master'

Conflicts:
	MidWorx/src/main/res/values/strings.xml