Menu Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer/Content/Content.contentproj