refs #6284 converted some directive controllers to use controllerAs. Initially I converted nearly of them but noticed it does not always make sense for directive controller so I revert most changes again. For regular controllers it still makes sense which we will use when using ngRoute
Merge branch 'master' of github.com:piwik/piwik