* Feat: started adding conflict checls

* Feat: finished BranchConflicting function

* Fix: fixed bugs in BranchesConflicting

* Feat: InheritBranches now checks conflicts

* Feat: completed AddBranch method

* Feat: refactored InheritBranches

* Refactor: refactored AddBranch

* Feat: started implementing objectstorage in branchmanager

* Refactor: refactored Parse functions

* Feat: added KeyPartitions to branchmanager objectstorage

* Refactor: refactored some code

* Feat: added events to Branch

* Refactor: refactored event logic

* Refactor: removed unnecessary code

* Refactor: replaced events with manager based implementation

* Refactor: refactored branchmanager to update branches

* Feat: removed unused property

* Refactor: removed unused method (fork does everything)

* Refactor: commit before branch change

* Feat: added a method to update the parent branch

* Feat: added SetModified in models

* Feat: completed different logics

* Feat: added ability to uncolor coins

* Refactor: refactored some code + comments

* Refactor: renamed ancestor to descendant :P

* adds comments from meeting (#411)

* Refactor: refactored some last stuff before merge

* Feat: updated to latest hive.go

* Feat: updated hive.go in tester

Co-authored-by: Luca Moser <moser.luca@gmail.com>

* Fix: fixed some error must be last param

* Refactor: continued refactoring according to golint

* Refactor: addresses more golint warnings

* Refactor: refactored error last

* Fix: fixed hive.go

* Refactor: refactored alot according to golang-ci-list

* Refactor: intermediary commit

* Refactor: refactored additional code according to golint-ci

* Refactor: continued to refactor according to golint

* Refactor: refactored according to golint

* Fix: fixed last golinter reports

* replace 'transaction' with 'message' in message layer pkg

* remove more occurrences of 'transaction'

* fixes ReferencedMessageId() returning approverMessageId

* renames ApprovingMessageId to ApproverMessageId

* use ApproverMessageId in deleteFureCone()

* refactors message pkg

* renames payloadId in Message to contentId

* finalize comment on what a Message is

* refactors additional message sub pkgs

* renames 'transaction' to 'message' in gossip plugin

* removes occurrences of 'transaction' in graph plugin

* removes occurrences of 'transaction' in metrics plugin

* refactors dashboard plugin for messages

* removes further occurrences where tx is used instead of msg

* fixes TestMessageRequest in manager_test.go

* go fmt explorer_routes.go

* fix review comments

* fix Errorf order

* throw around bones

* Feat: refactored message + started to add tests

* Refactor: go mod tidy

* Refactor: continued to refactor message

* Feat: updated to last hive.go + added Signature() methid

* Feat: go mod tidy

* Feat: added mutex to the signature write in Bytes()

* Fix: fixed Signature method

* Feat: refactored message methods

* Move marshalutil to hive.go

* Refactor existing code (before binary) to use new hive.go/identity #282

* Adjust binary code to use hive.go/identity and remove signature/ed25519 #282

* Adjust moved files from merge to use hive.go/marshalutil

* Adjust moved files from merge to use hive.go/identity and hive.go/crypto

* Adjust for changes in hive.go

* Fix: fixed a bug due to refactor

Co-authored-by: Hans Moog <hm@mkjc.net>

* Feat: started reworking output model

* Refactor: refactored some of the model

* Refactor: started to refactor some additional models

* Refactor: started to refactor message layer

* Refactor: still refactoring :/

* Refactor: refactored some more

* Refactor: some error messages are gone YAY

* Refactor: refactor complete