nic
Merge branch 'master' of https://github.com/dpii/Planovac-dordb.git

Conflicts:
	doc/model2.eap