Load official SQLite 3.7.16.2
Merge branch 'master' into sqlite-3.7.16.2

Conflicts:
	mutex.h
	os.h
	os_win.c
	resolve.c
	shell.c
	sqlite3.h
	sqliteint.h
	util.c
Missed a couple conflicts.