fix template
fix admin js file
fix admin js file
Merge branch 'master' of github.com:pavel-r/jmanual