Issue 33 + 30
Merge branch 'master' of https://github.com/GeminiCode/Bombermaaan-for-Firefox-OS

Conflicts:
	js/classes/bloc.js
	js/classes/deflagration.js