Signed-off-by: Jonathan Jonsson <nattejonsson@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	RDFProject/src/model/OperationHandler.java
	RDFProject/src/model/TypesHandler.java