modify test framework
merge workspace
add performance testing note
Merge branch 'master' of https://github.com/simonpatrick/stepbystep

Conflicts:
	.idea/workspace.xml
	stepbystep-java/pom.xml