back when done,
edit some layout,
Merge branch 'master' of https://github.com/alfrededison/android_project_team_HKD.git