FAIMS-322: removing isforked from insert queries
FAIMS-322: updating merge to detect forked data
FAIMS-322: adding database api to check if arch entity or relationship has forked data
FAIMS-322: adding conflict messages to entity and relationships to notify user if the record has conflicting data
merging master
FAIMS-322: updating arch entity history to conflict resolution + updating merge styles for arch entity
FAIMS-322: updating relationship history to allow conflict resolution + updating merge styles for relationships
Merge branch 'master' of github.com:IntersectAustralia/faims-web
FAIMS-322: fixing merge bug + parent timestamp for multivalued attributes
FAIMS-322: fixing revert for multivalued attributes
FAIMS-322: fixing update entities and relationships to redirect properly + fixing bug with showing history and having attributes that don't exist in certain rows