version intermediaire
Merge branch 'master' of ssh://git@github.com/valeriep/MBP.git

Conflicts:
	MBP/bin/MBP.apk
	MBP/bin/resources.ap_