shit
Merge branch 'master' of https://github.com/bachj3/MyPhysioApp

Conflicts:
	bin/MyPhysioApp.apk
	bin/classes/ch/bfh/ti/myphysioapp/BuildConfig.class
	bin/classes/ch/bfh/ti/myphysioapp/MainActivity.class
	bin/classes/ch/bfh/ti/myphysioapp/R$attr.class
	bin/classes/ch/bfh/ti/myphysioapp/R$drawable.class
	bin/classes/ch/bfh/ti/myphysioapp/R$string.class
	bin/classes/ch/bfh/ti/myphysioapp/R$style.class
	bin/classes/ch/bfh/ti/myphysioapp/R$xml.class
	bin/classes/ch/bfh/ti/myphysioapp/R.class
	bin/resources.ap_