Allowing binding a key to a single console command with "bind <key> !<console command>"
Merge branch 'master' into deadking
Adding refcount to flexers, fixed video lag and undo crashes
Merge branch 'master' into deadking
Chaging layer selection to layer-up and layer-down controls
Adding boundary and guides in edit mode
Merge branch 'master' into deadking
Merge branch 'deadking' of git://github.com/aaronjer/SPARToR into deadking
Adding GJ icons for deadkings
Adding GJ least_resistance map
Merge branch 'deadking' of https://github.com/superjer/SPARToR into deadking
Replacing strtok with custom tok function that is threadsafe
Merge branch 'master' into deadking
Adding engine object type POPUP for GUI elements, v_scale
Adding GUI menu for primary actions
Adding engine object type POPUP for GUI elements, v_scale

Conflicts:

	game/mod.c
Merge branch 'master' into deadking
Abstracting out detection of GUI elemets with gui_element_at(x,y)
Merge branch 'master' into deadking
Moving some GUI stuff to engine, adding gui hover