fixed bugs with collector
fixing one or many floor tiles
speeding up the game when getting more points
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/entities/faller.js