Merge pull request #10 from staven/master

Menus, control settings
map_list

don't know if we'll use it or not yet.
Fixes and tileset switch. Added includes

fixed map editor bug. Switched to Goo's latest tileset. Added includes.
Removing/changing VC project files

missed a 'w' ... :|
Add Makefile

Because maintaining it outside of the repo is a pain, and I have no idea how to tweak CMake.
Future-proofing for variable-width fonts
Merge branch 'master' of https://github.com/LordKaT/Wyrmwick

Conflicts:
	src/include.h
	src/menu.cpp
	src/settings_menu.cpp
Fix menu