commit
Merge branch 'master' of https://github.com/penggle/sample.git

Conflicts:
	src/com/penglecode/common/util/Assert.java