Many changes
Merge branch 'master' of https://github.com/OSCES/OSCES-FRAMEWORK

Conflicts:
	crossplatform/System/Keyboard/KeyCode.h
	crossplatform/System/Keyboard/Keyboard.cpp
	include/KeyCode.h