commit by wuyij
Merge branch 'master' of https://github.com/FreeYourMind/tongxunlu

Conflicts:
	Tongxunlu/Tongxunlu.xcodeproj/project.pbxproj
	Tongxunlu/Tongxunlu/Classes/Controller/Connect/ConnectViewController.m
	Tongxunlu/Tongxunlu/Classes/Controller/Connect/support/ContractViewController.h
	Tongxunlu/Tongxunlu/Classes/Controller/Connect/support/ContractViewController.m