Merge branch 'master' of D:\git_tutorial\github.com\examples with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaExamples.iml
move data providers to the test/java folder