Little Djif refactoring + new action 'edit'
Merge branch 'master' of github.com:sboye/djif