QA 19/11/2014
Merge branch 'master' of https://github.com/LetsHealth/AstellasCC

Conflicts:
	CasosHepatico/CasosHepatico.xcodeproj/project.pbxproj