fixes, buffering state
Merge branch 'master' of https://github.com/aleckravets/disk

Conflicts:
	js/services/player.js
	js/services/playlist.js