Server Stuff
Merge branch 'master' of https://github.com/srklonaris/HealthAtHome

Conflicts:
	bin/HealthAtHome.apk
	bin/R.txt
	bin/classes.dex
	bin/dexedLibs/android-support-v4-fb24c51452c8931c0a7807d8b39bd89a.jar
	bin/dexedLibs/google-play-services-95d9e1124af61156053d6692a0b18205.jar

bin/dexedLibs/google-play-services_lib-4de8f5739d9927041b4f0cd42cdc711c.
jar
	bin/resources.ap_
idk