out xml
Merge branch 'master' of https://github.com/repoproject/ims

Conflicts:
	doc/ui/ims/ims.gdws
new db