ignored file
Added models related to order-info
Merge branch 'development' of https://github.com/omnipos/OmniPOSDesktop into development

Conflicts:
	OmniPOS/build/classes/com/omnipos/models/OPObjectHolder.class
	OmniPOS/src/omnipos/OmniPOS.java