Merge branch 'master' of https://github.com/martinlau/fixture

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/martinlau/fixture