tried compiling ocl
Merge branch 'master' of github.com:matoilic/thesis

Conflicts:
	globals.pro
c++ 11 compilation config for os x