Merge pull request #1634 from MrTimscampi/es6

Merge the ES6 feature branch back into master

src/controllers/playback/videoosd.js

@@ -5,8 +5,6 @@ import datetime from 'datetime';
 import itemHelper from 'itemHelper';
 import mediaInfo from 'mediaInfo';
 import focusManager from 'focusManager';
-import imageLoader from 'imageLoader';
-import scrollHelper from 'scrollHelper';
 import events from 'events';
 import connectionManager from 'connectionManager';
 import browser from 'browser';