update player
Merge branch 'master' of https://github.com/Domiii/smart-video-2013

Conflicts:
	clipinfo/clips.json
	config.json
player