finish..
..last changes
Merge branch 'master' of github.com:hannicolas/admin-moderation