fix bugs in SiteManager
Merge branch 'master' of https://github.com/roselone/FootWith
login bug fixed
deal with conflicts