commit to branch version 1
Merge branch 'branch_version1'

Conflicts:
	com.cgtest/bin/classes/com/cgtest/MainActivity.class
	com.cgtest/src/com/cgtest/MainActivity.java