mes changements
Merge branch 'development' of https://github.com/Gladhus/cashsystem.git
into development

Conflicts:
	CashSystemLogic/src/com/cashsystem/test/Test.java