finalized advanced mappings in XML
Merge remote-tracking branch 'origin/modeling-attempts' into modeling-attempts

Conflicts:
	src/clj_hypergraph_db/core.clj