update Numbers:7
Merge remote-tracking branch 'origin/master' into altimisia

Conflicts:
	Numbers