Added new score type Zero-One
Merge branch 'master' of https://github.com/icplayer/icplayer.git

Conflicts:
	changelog.txt