option renaming on client applied
Merge branch 'develop' of github.com:izzappel/boom into develop

Conflicts:
	Boom/Boom/revealjs/index.html