adding category
playing video inline, setting player variables
Merging Testing branch