Merge medicationstatement medicationprescription
Merge branch 'master' of github.com:fhir-ru/fhir-svn

Conflicts:
	translated-19-11-2014.txt