resubmit
smallchnges
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD

Conflicts:
	src/com/soen6441/ui/common/GridView.java
	src/com/soen6441/ui/map/MapView.java
Merge pull request #36 from joeyzhang1989/master

resubmit-to fix the revert
Merge pull request #37 from alexwolfwang/master

add a commit in mainscene
small changes
add data
Confliction on GridView Fix

Confliction on GridView Fix
Merge pull request #1 from zhaozheid/master

update