Merge branch 'development_line' into defect_line

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