commit by elvis
Merge branches 'master' and 'master' of github.com:FreeYourMind/tongxunlu

Conflicts:
	Tongxunlu/Tongxunlu.xcodeproj/project.pbxproj
	Tongxunlu/Tongxunlu/Classes/Common/Constant.h