Fixed merge error by lehmamic
Removed no more used file
Merge branch 'develop' of https://github.com/izzappel/boom into develop