bug fix: template missing, import error in convert function
bug fix: deletion of file function for close_page
Merge branch 'm-miki-bug_fixing_convert_function'
Hide blank categories in module
Add keep filename setting to tool convert
Merge branch 'kanety-convert'
change ssl shared
add creator group options (convert function)
Merge branch 'master' of git://github.com/zomeki/zomeki-development
Merge branch 'master' of git://github.com/mmukai/zomeki-development
Merge branch 'ssl' of git://github.com/mmukai/zomeki-development
Merge branch 'master' of git://github.com/m-miki/zomeki-development into m-miki-master
Merge branch 'm-miki-master'
Replace special character with character reference when adding kana
Update schema
Change many_inquiries form
Merge branch 'gp_article' of git://github.com/mmukai/zomeki-development into mmukai-gp_article
Merge branch 'mmukai-gp_article'
Merge branch 'master' of git://github.com/zomeki/zomeki-development
Add multiple files selectable form to tool convert