Update player
Merge branch 'master' of https://github.com/miclle/multimediaplayer

Conflicts:
	player/flash/SewisePlayer.swf