changes to encounter
Merge branch 'master' of https://github.com/cqframework/OneModel

Conflicts:
	QUICK/eap/QUICK.eap