tidy imports of logic and common
tidy imports
move room.xml to conf/
Merge branch 'master' of github.com:yangsf5/claw-cgp into HEAD