sync
Merge branch 'master' of https://github.com/lpeancovschi/mEmed

Conflicts:
	mEmed.xcodeproj/project.pbxproj
	mEmed/HTTPClient.m
	mEmed/mEmed.xcdatamodeld/mEmed.xcdatamodel/contents