Merged CategoryDao and CategoryJpaDao.
Merge branch 'registration' of https://github.com/FengLee/A7B36SI2.git
into registration