Merge branch '7.x-1.x' of git.drupal.org:project/html5_media into 7.x-1.x

Conflicts:
	player/doc/files.html
	player/doc/index.html
	player/doc/symbols/_global_.html
	player/doc/symbols/jQuery.fn.minplayer.html
	player/doc/symbols/minplayer.async.html
	player/doc/symbols/minplayer.compatibility.html
	player/doc/symbols/minplayer.controller.base.html
	player/doc/symbols/minplayer.display.html
	player/doc/symbols/minplayer.file.html
	player/doc/symbols/minplayer.flags.html
	player/doc/symbols/minplayer.image.html
	player/doc/symbols/minplayer.playLoader.base.html
	player/doc/symbols/minplayer.players.base.html
	player/doc/symbols/minplayer.players.flash.html
	player/doc/symbols/minplayer.players.html5.html
	player/doc/symbols/minplayer.players.minplayer.html
	player/doc/symbols/minplayer.players.vimeo.html
	player/doc/symbols/minplayer.players.youtube.html
	player/doc/symbols/minplayer.plugin.html