s
Merge remote-tracking branch 'origin/master'

Conflicts:

	BankierenNoObserverFX/BankierenNoObserverFX/nbproject/private/private.properties
Merge branch 'master' of https://github.com/Alexandervc/Bankap