update
Merge branch 'master' of https://github.com/hidog/test

Conflicts:
	test/ConsoleApplication1/main.cpp