Confliction on GridView Fix

Confliction on GridView Fix
Merge branch 'master' into zz_local
PathValidator

Not fully Implemented
bug fix
method changes implementation
Road now supporting type

Road now supporting type
Merge branch 'zz_local'

Conflicts:
	src/com/soen6441/ui/common/GridView.java
MapView works

MapView works
spelling mistakes+ suggestedSize for GridView
suggestedSize() implementation
Miniral Change

Miniral Change
Merge branch 'master' into zz_local
add junit test
Modified the demo play

Modified the demo play
Merge branch 'zz_local'
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD
small changes
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD
Merge branch 'master' into zz_local
align map in center of editing view