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