POM.XML added
POM.XML added
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/fitnesse/FitNesseVersion.java
	src/fitnesse/slim/fixtureInteraction/DefaultInteraction.java
	src/fitnesse/slim/fixtureInteraction/DefaultInteractionTest.java
	src/fitnesse/slim/fixtureInteraction/FixtureInteraction.java
	src/fitnesse/slim/fixtureInteraction/InteractionDemo.java
	src/fitnesse/slim/fixtureInteraction/LoggingInteraction.java
	src/fitnesse/slim/fixtureInteraction/MockingInteraction.java
	src/fitnesse/slim/fixtureInteraction/Testee.java