Some fix
Merge branch 'master' of https://github.com/ingouackaz/Bomberbubble

Conflicts:
	BomberBubble/BomberBubble.userprefs