end of game working, but bug with restarting the game from end screen
Lots of changes; events; stuff
Merge commit '98e730274454f4e9ebacb70a1462e01a4f4ba39d' into aaron_mac

Conflicts:
	bin/data/LEVELS/level_1.xml
	src/AudioHandler.cpp
	src/AudioHandler.h
	src/Controller.cpp
	src/Field1.cpp
	src/GameScreen.cpp
	src/GameScreen.h
	src/MenuScreen.cpp
	src/Model.cpp
	src/Model.h
added updated block timer so we can stage block generation.
Merge commit '0720d9fa03d200551c7e200f8422264d2d2405ad' into aaron_mac

Conflicts:
	bin/data/variables.xml
	src/CircleObstacle.cpp
	src/Model.cpp