Began setting up the demo on the hosted server. Pushed all laster code and began filling in the data for 4 products with 8 accessories for each of 5 machines. Tested the management operations in setting up the machines. Then, tested the machine operation. Corrected issues found with running on the hosted server vs. the local environment. Corrected an issue where the machine type was not being transfered to the kiosk but is required when saving the product quantities after a purchase. The readonly flag on the entity relationship between the machine type and the machine. Discovered that firefox does not support mp4 video. Researched what they do support and converted the advertising videos to webm which is also supported by google chrome which is our actual target any way. Chrome will also run mp4, so kept support for that as well. Converted the media handler to take a filename instead of the file key so it could determine which version of a media file to send. Added cache control headers to the user uploaded images so they would appear snappier as the hosted server will have a noticeable flicker if the images are not cached locally. Added cache control definitions for the advertising files as well so there is no delay in their playback. Refactored the secure servlet to allow reuse of it content expiration code in these processes. Refactored the audio playback to restart when the screen comes out of advertising mode. Refactored the advertising code on the client to not throw an error if not advertising media has been added to a vending machine. Corrected an issue where duplicate shelves could be added to a vending machine when they were being newly added (before save). Corrected an issue where a advertising item could not be removed from a vending machine. Refactored to make the machine reload its data before going into advertising mode so it could get the latest advertising changes before each advertising mode starts. Added additional shelves to the data used to create machines from scratch. This makes it much easier to configure the 5 machines.