Fix JDI Merchandising add
Merge branch 'master' of https://github.com/Stepedons-Tinkers/jardine-android

Conflicts:
	src/co/nextix/jardine/activites/fragments/CompetitorStockCheckFragment.java