Restore compiling
Merge branch 'master' into adapt_to_glbinding_1_0

Conflicts:
	source/glow/include/glow/Sync.h
	source/glow/source/glow.cpp
Merge branch 'master' into adapt_to_glbinding_1_0

Conflicts:
	source/glow/source/glow.cpp
Merge branch 'master' into adapt_to_glbinding_1_0
Merge pull request #237 from hpicgs/adapt_to_glbinding_1_0

Adapt to glbinding 1.0