camera icon showing on list activity action bar
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/res/menu/checkout.xml