Add Observer Pattern and JUnit4
Merge branch 'zz_local'

Conflicts:
	src/com/soen6441/core/map/MapPoint.java
	src/com/soen6441/ui/map/cell/ScenaryCell.java
	src/com/soen6441/ui/scene/PlayingScene.java