Merge branch 'master' of github.com:krakencalamari/cogwgl

Conflicts:
	winglu/gl_window.cpp
	winglu/gl_window.h
Merge branch 'master' of github.com:krakencalamari/cogwgl