Commit Defectline 01 kohjii
Merge branch 'development_line' into defect_line

Conflicts:
	src/net/jazz/uws/squawkers/Dog.java
Merge branch 'defect_line'

Conflicts:
	src/net/jazz/uws/squawkers/Cat.java
	src/net/jazz/uws/squawkers/Dog.java