Fixed error
Merge branch 'master' of
https://github.com/AlienRunner/AndroidServer.git

Conflicts:
	.classpath