提交
Merge branch 'master' of https://github.com/RongShu/ios_v

Conflicts:
	VPS/Base.lproj/Main_iPhone.storyboard
	VPS/Classes/LearningJournal/HKCircularProgressLayer.m
	VPS/Classes/LearningJournal/LearningJournalViewController.m