++
nono
Merge branch 'dev' into dev_gaoke

Conflicts:
	src/com/test/HelloWorld.java