Even more botched merge fixes
Merge branch 'master' of https://github.com/inpaner/information-asset-registry.git
Merge branch 'master' of
https://github.com/inpaner/information-asset-registry.git

Conflicts:
	Information Asset Registry/src/view/gui/content/form/field/Field.java
I'm not sure what is happening anymore
Merge branch 'master' of https://github.com/inpaner/information-asset-registry.git