prop
Merge remote-tracking branch 'origin/master'

Conflicts:

	BankierenNoObserverFX/BankierenNoObserverFX/nbproject/private/private.properties