Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Sqllite/LYSqllite.m