Remove duplicated directory
Merge branch 'master' of https://github.com/aseandroid/medic_app

Conflicts:
	gen/android/support/v7/appcompat/R.java
	gen/ase/pdm/pdm_medical/R.java
Remove duplicated directory
Merge branch 'master' of https://github.com/aseandroid/medic_app

Conflicts:
	gen/android/support/v7/appcompat/R.java
	gen/ase/pdm/pdm_medical/R.java
test