Main, Store
Merge branch 'master' of https://github.com/ooap/POST

Conflicts:
	org/main/managers/Store.java
Merge branch 'master' of https://github.com/ooap/POST

Conflicts:
	.idea/workspace.xml
	org/main/catalogs/Sale.java