fixed add todo
fixed collection bug
added forgotten file
Merge branch 'master' of github.com:danielsmith-eu/webbox