git pull from master
Merge branch 'bbZ_workspace' into bbZ_betaBuild

Conflicts:
	src/main/java/com/bbZoftware/hibernateEntities/SqfaComment.java
	src/main/java/pl/gameChecker/model/database/DatabaseModel.java
	src/main/java/pl/gameChecker/model/database/TempDBMain.java
	src/main/java/pl/gameChecker/model/hibernateEntities/Company.java
	src/main/java/pl/gameChecker/model/hibernateEntities/Game.java
	src/main/java/pl/gameChecker/model/hibernateEntities/Gametype.java
	src/main/java/pl/gameChecker/model/hibernateEntities/Member.java
	src/main/java/pl/gameChecker/model/hibernateEntities/MembersRoles.java
	src/main/java/pl/gameChecker/model/hibernateEntities/Role.java
	src/main/java/pl/gameChecker/model/hibernateEntities/SqfaAnswer.java
	src/main/java/pl/gameChecker/model/hibernateEntities/SqfaComment.java
	src/main/java/pl/gameChecker/model/hibernateEntities/SqfaQuestion.java
	src/main/java/pl/gameChecker/model/hibernateEntities/SqfaQuestionComment.java
merge fix