Adding jplayer playback
Merge branch 'master' of https://github.com/mikeymckay/papaya-server

Conflicts:
	public/index.html