moved stuff into controller
Merge pull request #62 from wolves-2014/separate-js-controller

moved stuff into controller