Merge pull request #4 from zhaozheid/master

update
Merge pull request #5 from zhaozheid/master

update
implement the price check dialog
change
change
Merge pull request #62 from joeyzhang1989/master

change
refactoring
update the price of the tower
Merge remote-tracking branch 'origin/zcl_local'
working upgrade tower
finsh tower upgrade
implement sell tower
Merge remote-tracking branch 'origin/wmy_local'

Conflicts:
	src/com/soen6441/ui/scene/NewMapScene.java
finish the selling tower
update comment
hide the upgrade when the levle reach the maximum
Merge remote-tracking branch 'origin/zcl_local'
small change
Merge remote-tracking branch 'origin/zcl_local'
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD