Adding mp4 to the mime map of the server and minor tweaks
Merging HEAD
Merging HEAD
Moved play movie functionality to a directive