refactoring cid
recovering from git hell
reset author

recovering from git hell
i do not know what is happening

Merge branch 'client-broken-refactoring-cid' of github.com:danielsmith-eu/webbox into client-broken-refactoring-cid
merging delete updates in

Merge branch 'master' into client-broken-refactoring-cid
update to backbone saved the day