nothing
Merge branch 'develop' of https://github.com/jacekgdudek/smashjs2 into develop

Conflicts:
	web/js/eventHandler.js
	web/js/main.js