updated to current maven-ant-tasks-2.1.3.jar from maven.apache.org
moved maven-ant-tasks to antlib since it is not a dependency of jbehave itself
this fixes [JBEHAVE-651] except for the last item which can be ignored
fix to avoid merge conflict
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	distribution/src/lib/build.xml
JBEHAVE-656: HTML decoration for parameter empty string puts a span between each char in the line

Do not mark empty string as parameter (doesn't make sense since replace will put a marker between every char)
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
JBEHAVE-675: in the archetypes "custom converters" is mistyped as "custom coverters", 2 archetypes contain a file my_step.xml which is a sping bean file that is not used

removed the file from pico and guice, change coverters on all files
Merge remote-tracking branch 'remotes/upstream/master'
JBEHAVE-680: PendingStepMethodGenerator doesn't put a space between ) and {
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	jbehave-core/src/main/java/org/jbehave/core/steps/PendingStepMethodGenerator.java
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
JBEHAVE-705: decorated txt reports get broken if the text contains <script></script> tags
Merge remote-tracking branch 'remotes/upstream/master'
removed change for JBEHAVE-680 to unit test
JBEHAVE-710 Pending steps methods should remove even more characters
use isJavaIdentifierPart instead of explicit list of removable chars

JBEHAVE-680 PendingStepMethodGenerator doesn't put a space between ) and {
Merge remote-tracking branch 'remotes/upstream/master'
JBEHAVE-711 empty lines in example tables should be ignored
add check for empty line as test case
JBEHAVE-719 - groovy upgrade
JBEHAVE-665: Added section to clarify the out-in approach to Embedder controls configuration.