Fixed infinity loop
Merge branch 'master' of https://github.com/Zpiritual/fluxx

Conflicts:
	qt/project_fluxx/profiles.txt
	src/GameLogic.cc
Merged bugfixes