testing
testing
testing
testing
Merge commit 'f28fd9e4d86cbd7b57a1ed1e8d5fd3bd7ed3d7ff'

# By Avishay (2) and Tzur Sayag (1)
# Via Avishay (2) and Tzur Sayag (1)
* commit 'f28fd9e4d86cbd7b57a1ed1e8d5fd3bd7ed3d7ff':
  The Mark operation is working correctly, still not updating the "Shopping List" card. Image is changing, item is marked at the info card.
  Changed html message header
  updating "Mark" card is now working. reply with voice command is now recognized.

Conflicts:
	mirror-api-glassware/mirror-quickstart-java/src/main/java/com/google/glassware/custom/vm/itemInfo.vm
	mirror-api-glassware/mirror-quickstart-java/src/main/java/com/google/glassware/custom/vm/shoppingList.vm
remove redundant file
code tidy up