commit
Merge branch 'master' of https://github.com/dionellorera/TrackingAndOrderingSystem

Conflicts:
	app/src/main/java/imperium/com/trackingandorderingsystem/ProductDetails.java
	app/src/main/res/menu/products_selection.xml