Test Carlo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/src/com/example/Android/MyActivity.java