fixed platform speed reset on death
resolved conflicts
updated platform velocity to also generate platforms more frequently, to avoid massive gaps
Merge branch 'master' into dev_ed
Merge branch 'master' into dev_ed

Conflicts:
	app/assets/javascripts/game.js

  There was't a real conflict