Merge pull request #15 from wolfy852/next

Add the Jump Thok ability and water running flag for use by custom characters
Merge pull request #18 from wolfy852/next

Switch the Linux symbolic links with manual copy-pastes
DIE, DIE, DIE

Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a
come back to life
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a
Merge remote-tracking branch 'wolfy852/next' into next