Merge branch 'design1.2'

Conflicts:
	JiaMian.xcodeproj/project.pbxproj
	JiaMian/HomePageViewController.m
Merge branch 'register'

Conflicts:
	JiaMian.xcodeproj/project.pbxproj
	JiaMian/CommonMarco.h
	JiaMian/HomePageViewController.m
	JiaMian/MessageDetailViewController.m
	JiaMian/NSString+Extenions.h
	JiaMian/NSString+Extenions.m
Merge branch 'master' of github.com:wangyangkobe/jiamian

Conflicts:
	JiaMian.xcodeproj/project.pbxproj
	JiaMian/Base.lproj/Main.storyboard
	JiaMian/NSString+Extenions.h
	JiaMian/NSString+Extenions.m
	JiaMian/RegisterViewController.h
	JiaMian/RegisterViewController.m