Merge branch 'zhihao' of https://github.com/dolob-mrmr/FP-Android into zhihao
user story
Merge branch 'zhihao'
Merge branch 'master' of https://github.com/dolob-mrmr/FP-Android