Add data for a few tables and fix some bugs
Merge branch 'develop' into KM-tech
Merge pull request #49 from if045/KM-tech

Add data for a few tables and fix some bugs