commit for merge test.php
fix conficts
Merge branch 'master' of https://github.com/TychoLin/dcview
generate mapping between old and new category