made it possible to specify the GL context to use
Removed the destructor of the context object to allow it to be passed by value
merged with gl-context-test and resolved conflict
fixed some compiler warnings
merged and resolved conflicts