added jwplayer
Merge remote-tracking branch 'origin/master'

Conflicts:
	wsgi.py
hotfix