Merging after pull

Conflicts:
	.classpath
Merge branch 'master' of github.com:fefedao/batima-android-ver