Merge remote-tracking branch 'origin/work'
Merge remote-tracking branch 'origin/work'
Merge branch 'work'
Merge remote-tracking branch 'origin/work'
added reset method to backend
mango is now weakly referenced
modal from menu, js-templating