7.4 night
1.上传图片功能
2.修复一些bug
Merge branch 'dev-2'

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard
	Metic/Main Classes/LoginViewController.m
	Metic/Utils/PhotoGetter.m
fix