Signed-off-by: mackentan <jundongtan@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	zjh/src/com/macken/zjh/screens/MenuScreen.java

Signed-off-by: mackentan <jundongtan@gmail.com>