Merge branch 'vision_intrgrate' of https://github.com/trunone/GPPlatformMain

Conflicts:
	Linux/build/Makefile
	Linux/project/sks/main.cpp