removed cameraTest project
sleeeeeeep time
sleepcoding
Merge remote-tracking branch 'origin/master' into menus
placeTileAt
game/menu/scenario
astuff
displaylist meshes, assets work after new wnd
Merge remote-tracking branch 'origin/master' into menus
circular sequence, menu stuff
Revert "displaylist meshes, assets work after new wnd"

This reverts commit 3e9b27d66a403ec911db4828f142f6a8f2bc54a0.

Conflicts:
	Carcassonne/Carcassonne.vcxproj
	Carcassonne/Carcassonne.vcxproj.filters
	Carcassonne/include/carcassonne/gui/menu.h
	Carcassonne/src/carcassonne/gui/menu.cc
fixed bad stuff
okay
Merge remote-tracking branch 'origin/menus'