Merge branch 'master' of
https://github.com/inpaner/information-asset-registry.git

Conflicts:
	Information Asset Registry/src/controller/MainController.java
Ignored

.classpath and .gitignore