test2
daily commit
daily #2
daily 3
Merge branch 'v1.0'

Conflicts:
	test2/src/test2/client/GreetingServiceAsync.java