no comment
no comment
Merge branch 'master' of https://github.com/pavel-r/jmanual
resolve conflict in admin.js