Merge origin/master

Conflicts:
	nbproject/private/private.xml
	src/Level.cpp
Merge origin/master

Conflicts:
	nbproject/private/private.xml
	src/Level.cpp