Make description tag into a single line
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	pom.xml
Merge branch 'develop' of https://github.com/kaazing/k3po.java into develop
Merge pull request #5 from dpwspoon/develop

catch up master from trunk because it was mistakenly ahead