Merge branch 'master' of https://github.com/solohsu/ContactEditor

Signed-off-by: solohsu <hsushulong@gmail.com>