Fixed incompatibility between quickadd and type-based access control
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Deleting an old version of the Vancouver Maratime Museum profile
An updated, almost final version of the VMM installation profile
Merge branch 'master' of https://github.com/collectiveaccess/providence

Conflicts:
	install/profiles/xml/VMM_new.xml
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'master' of https://github.com/collectiveaccess/providence
Merge branch 'develop' of https://github.com/collectiveaccess/providence into develop
NOJIRA make sure returned instances has transaction set
NOJIRA rollback after ending import log
NOJIRA propagate transaction when calculating hierarchy; set recalculated hierarchical indexing to avoid divide by zeros
Merge branch 'develop' of https://github.com/collectiveaccess/providence into develop