my applicatino model changes
Merge branch 'master' of https://github.com/ecrit/pharmacy_at.git

Conflicts:
	at.medevit.ecrit.pharmacy_at.application/Application.e4xmi
fix broken application.e4xmi