代码合并！
Merge branch 'master' of https://github.com/XIAOPIU/beatyHelp

Conflicts:
	beatyHelp.xcodeproj/project.pbxproj
	beatyHelp/BHAlertView.swift
	beatyHelp/BHHttpPostRequest.swift
	beatyHelp/CreateController.swift
	beatyHelp/ManageController.swift
	beatyHelp/ViewController.swift