Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Sqllite/LYSqllite.m