Merge branch 'master' of git://github.com/swarage/612-2013 into swj

Conflicts:
	states/state_climbing.cpp
Merge branch 'master' of git://github.com/swarage/612-2013 into swj