fix bug when pull
Merge branch 'team2' of https://github.com/GitTrainer/FileCloud into team2
fix merge
edit users view