FIXED
Merge branch 'Dev' of https://github.com/LittleEye/ClientRecorder into Dev

Conflicts:
	src/app.js