commit R.java and propierties
Merge branch 'master' of
https://github.com/mHealthDroid/mHealthDroid.git

Conflicts:
	gen/com/pfc/mhealthdroid/R.java