no message
Merge branch 'v1.0.0' of https://github.com/lcqgrey/WineApp into v1.0.0

Conflicts:
	WineApp/WineLoginCenter/ForgetPasswordViewController.xib