Merge changes from psnewmodel

Merge commit '966fee6960fd3b0d2954e96e08dac93ef9fb6358'

Conflicts:
	lib/QPersistence/src/relations.cpp
	lib/QPersistence/src/relations.h