improvements in the option menu
Merge branch 'aries3'
Merge branch 'Yingjie'

Conflicts:
	src/resource.js
h
Merge branch 'Yingjie'
Merge branch 'aries2'
Fix Bacteria Animation
more fixes
Fixed Multiple doctors placement in one grid
...
asd
Introducing DoctorType.js to handle different type of doctors
Fixed doctors positioning on the grid, and many small things......