basic menu added
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	SolarSailor/SolarSailor/Game1.cs
	SolarSailor/SolarSailor/SolarSailor.csproj.Debug.cachefile
	SolarSailor/SolarSailorContent/SolarSailorContent.contentproj
fixing up merge of master and unstable branches

marc commited to master so I had to merge master and the unstable
branches that joe had done.   Should be working pretty well now.