Commit: Merge Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/co/nextix/jardine/activities/add/fragments/AddActivityFragment.java
Commit: Add view for Product Supplier and Project Requirement.
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/fragment_activity_jdi_merchandising_check.xml
	src/co/nextix/jardine/activities/add/fragments/AddActivityFragment.java
Commit: Minor Changes in product supplier and Project Requirements.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/co/nextix/jardine/activities/add/fragments/CompetitorStockCheckFragmentAdd.java