update sqlite3_test
update plants_and_lyrics
Merge branch 'master' of https://github.com/siryang/toolkits
update dither shuffling
Merge branch 'master' of https://github.com/siryang/toolkits into siryang_branch

Conflicts:
	dither/example/test_dither/dither_shuffling.cpp