Merge branch 'upstream/master'

Conflicts:
	fmdb.xcodeproj/project.pbxproj
	src/fmdb.m
Merge branch 'origin/master'