improve profile page
Merge branch 'develop' of https://github.com/shidh/CSSA into develop
fix set googlemap  marker
Merge branch 'develop' into Allen_Branch
fix marker lable
improve ui of main page
Merge branch 'develop' of https://github.com/shidh/CSSA into develop
backup
user can view news and will get an alert without login
Merge branch 'Allen_Branch' into develop
partner in main page
Merge branch 'develop' of https://github.com/shidh/CSSA into develop
fix bug :list
Merge branch 'lxj' into develop
pagination ui