Update .travis.yml
Merge branch 'macos-build' of https://github.com/dalerank/caesaria-game into macos-build
Update CMakeLists.txt
Update CMakeLists.txt
Update CMakeLists.txt
Merge branch 'master' into macos-build
Merge branch 'macos-build' of https://github.com/dalerank/caesaria-game into macos-build
Update gl_engine.cpp
Merge branch 'master' into macos-build
Merge branch 'macos-build' of https://github.com/dalerank/caesaria-game into macos-build

Conflicts:
	source/gfx/gl_engine.cpp
Windows fix get gl functions
merge with master
fix gl functions get
merge with master
Merge branch 'macos-build' of https://github.com/dalerank/caesaria-game into macos-build
Merge branch 'master' of http://bitbucket.org/dalerank/caesaria
Merge branch 'master' into macos-build
merge with master
merge with master
fix gl functions 4 android