v6
v7
v8
Merge branch 'F60136240_Emergency' into dev

Conflicts:
	HelloWorld/src/com/kevingu/home/HelloWorld.java
v9