Unable to resolve bug: IllegalStateException: An entity copy was already assigned to a different entity.
Unable to resolve bug: IllegalStateException: An entity copy was already assigned to a different entity.
Posting of expenditure
Posting of expenditure
Menu for invidivual trip options
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/model/Trip.java
	src/main/resources/messages/messages_nl.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/model/Trip.java
	src/main/resources/messages/messages_nl.properties