Fixed Mali's folder structure again
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath