fix merge1
Merge branch 'master' of https://github.com/doctorapp/doctorapp
fix merge1