add admin router, controller and templates
Merge branch 'master' into new-features
add TODO item
add fix TODO
add more TODO
Add more TODO
better style for TODO
much better todo
much better todo again
Merge branch 'new-features'