ozCommit_02

ozCommit_02
Merge branch 'master' of https://github.com/TestAozi2/Watch2

Conflicts:
	GitHubTest3/bin/oz/bean/User.class
	GitHubTest3/src/oz/bean/User.java