template add and todo
ok for active and todo for photo
Merge branch 'jannson'