still lack two pages
Merge branch 'master' of https://github.com/Canymebee/ICSSP_Android