GLFW: Added glfw key support. Fixed a runtime error on windows. Style fixes
Merge branch 'master' of https://github.com/inspuration/citra into synchronization

Conflicts:
	src/core/core.vcxproj.filters
	src/core/hle/service/gsp.cpp