Removed recording-related classes and files, to be fixed on the george branch later
Merge branch 'master' into dev