modified:   cuon_client/cuon/Garden/GUI/alternate1/alternate1_hibernation.glade2
	modified:   cuon_client/cuon/Order/GUI/alternate1/alternate1_order.glade2
	modified:   cuon_client/cuon/Preferences/GUI/alternate1/alternate1_preferences.glade2
Merge branch 'master' of github.com:CuonDeveloper/cuon
	modified:   cuon_client/cuon/Articles/GUI/alternate1/alternate1_articles.glade2
modified:   cuon_client/cuon/Order/GUI/alternate1/alternate1_cash_desk.glade2
Merge branch 'master' of github.com:CuonDeveloper/cuon

Conflicts:
	cuon_client/Cuon.py
	cuon_client/cuon/Articles/GUI/alternate1/alternate1_articles.glade2
	cuon_client/cuon/Garden/GUI/alternate1/alternate1_hibernation.glade2
	cuon_client/cuon/Order/GUI/alternate1/alternate1_cash_desk.glade2
	cuon_client/cuon/Order/GUI/alternate1/alternate1_order.glade2
	cuon_client/cuon/Preferences/GUI/alternate1/alternate1_preferences.glade2
	cuon_client/version.cfg