Changed naming, the coupling in requirejs and some weird Collection-beha...

...viour in app.js

Oh! And also some JsLint-issues! Working as intented, hopefully