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

Conflicts:
	SQLite_Test/src/SQLiteControl.cpp
	SQLite_Test/src/SQLiteControl.h