Initial interface for javascript contentmanagers

contentmanager.js is going to be a js proxy for the current
filenbmanager.py.  This will allow a contentmanager for Google Drive to
be created.

IPython/html/static/base/js/contentmanager.js

@@ -15,6 +15,7 @@ define([
         // with the normal file operations.
         //
         // Parameters:
+<<<<<<< HEAD
         //  options: dictionary
         //      Dictionary of keyword arguments.
         //          events: $(Events) instance