Renaming control interface to controller interface.
Moving controller import into the initialisation.
Removing old addListener method.
Merge branch 'master' into gh-pages

* master:
  Removing old addListener method.
  Moving controller import into the initialisation.
  Renaming control interface to controller interface.