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
garbage
Merge commit 'dbafd70b098a1f08697c3f02f4869c49a7a9eb7b'

Conflicts:
	src/ase/pdm/pdm_medical/MainActivity.java
fixed activity navigation
possible conflict
Merge branch 'master' of https://github.com/aseandroid/medic_app.git