修正icon名稱
生活圈初始化
Merge remote-tracking branch 'refs/remotes/origin/DEV_NTOULife' into DEV_功課表＆支援iphone5

Conflicts:
	Modules/Stellar/ClassDataBase.m
	NTOUMobile.xcodeproj/project.pbxproj