Finishing gameloop and waves
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/GameMenu.cpp
	TowerDefense/GameMenu.h