Added level switching
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/maps/level.map