Template for mock test
Merge branch 'master' of https://github.com/palleev/java

Conflicts:
	src/com/alex/DataSourceClient.java