Added gitignore
Updated jplayer
increment version
Merge branch 'master' into 5.7

Conflicts:
	.gitignore
	controller.php