Commit: Merge Commit.
Merge remote-tracking branch 'origin/master'
Commit: Added Adapters for JDIProductStockCheck and
JDIProductMerchandisingCheck
Commit: .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/table_row_jdi_product_stock_check.xml
	res/values/strings.xml
	src/co/nextix/jardine/activites/fragments/JDIProductStockCheckCustomAdapter.java
Merge remote-tracking branch 'origin/master'