last version
Merge branch 'master' of github.com:lexussab/Test

Conflicts:
	MyService2.java