first commit
Merge branch 'develop' of https://github.com/Suntw/android_ui into develop