media add
heigth fix
fixover
build
Merge branch 'public'

Conflicts:
	bin/AndroidManifest.xml
	bin/R.txt