Merge branch 'origin/aries'
lite lite
fix some small stuff
Collision medicine-bacteria
fix
Merge branch 'origin/aries'
option and its navigation fixed
Fixed bug with different sprites of bacteria
Rotating medicine
Merge branch 'JOY'
Merge branch 'aries'

Conflicts:
	src/Game/Bacteria.js
	src/config/BacteriaType.js