Version 1
Merge branch 'master' of ssh://git@github.com/JulienLefevre/Android.git

Conflicts:
	.classpath
	bin/R.txt