refactoring
refactoring
Merge remote-tracking branch 'origin/zcl_local'
original bulid a map frame
Merge remote-tracking branch 'origin/wmy_local'

Conflicts:
	src/com/soen6441/ui/scene/NewMapScene.java
Merge remote-tracking branch 'origin/zcl_local'
Merge remote-tracking branch 'origin/zcl_local'
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD
add canUpgrade method