work space 2
Merge branch 'master' of https://github.com/chen-jianshu/SQLiteManager4iOS

Conflicts:
	SQLiteManager.h