nothing
Merge remote-tracking branch 'origin/master' into master-kevin
Merge remote-tracking branch 'origin/master' into master-kevin
Merge remote-tracking branch 'origin/master' into master-kevin

Conflicts:
	res/layout/view_activity_trainings.xml
Commit: Activity Search
Merge remote-tracking branch 'origin/master' into master-kevin

Conflicts:
	src/co/nextix/jardine/activites/fragments/ActivityBrandActivationFragment.java
	src/co/nextix/jardine/collaterals/CollateralsEventProtocols.java
	src/co/nextix/jardine/collaterals/CollateralsMarketingMaterials.java
	src/co/nextix/jardine/collaterals/CollateralsSalesProtocols.java
	src/co/nextix/jardine/customers/ViewAllCustomersFragment.java
	src/co/nextix/jardine/fragments/WorkplanMenuBarFragment.java
Commit: StartActivity DATE Search
Merge remote-tracking branch 'origin/master' into master-kevin