Changes in PlayerView
Merge branch 'master' of https://github.com/guerre50/VionLabsHack

Conflicts:
	public/js/app/views/Record.js