Update/ Scaled plants and such
Merge branch 'ZY' of https://github.com/zhengyeve/SeniorSem into ZY

Conflicts:
	ogre_test/GameFramework.cpp
	ogre_test/PlantManager.cpp

Merging