edit loginview

edit loginview
Merge branch 'master' of https://github.com/wesleysui/MarketManager

Conflicts:
MarketManager/LoginViewController.swift
Merge branch 'master' of https://github.com/wesleysui/MarketManager