add profile UI to settings, modify login logic in mainActivity, delete unused files
fix merge conflict
Merge branch 'master' of https://github.com/tsiyan/CICS530