model code update 1
exluded stuff
removed stuff in branch develop
Merge branch 'develop'
Merge remote-tracking branch 'Sascha/master' into merge_sascha

Conflicts:
	.gitignore
Merge pull request #1 from Bummel/master

your model update
logic update 2
Merge remote-tracking branch 'Sascha/slaveNo2' into sascha_merge

Conflicts:
	src/gmb/model/financial/ExternalTransaction.java
	src/gmb/model/financial/InternalTransaction.java
	src/gmb/model/financial/LotteryBankAccount.java
	src/gmb/model/financial/ReceiptsDistribution.java
	src/gmb/model/financial/Transaction.java
	src/gmb/model/financial/Winnings.java
	src/gmb/model/request/GroupAdminRightsTransfereOffering.java
	src/gmb/model/request/GroupInvitation.java
	src/gmb/model/request/GroupMembershipApplication.java
	src/gmb/model/request/GroupRequest.java
	src/gmb/model/request/MemberDataUpdateRequest.java
	src/gmb/model/request/RealAccountDataUpdateRequest.java
	src/gmb/model/request/Request.java
	src/gmb/model/tip/DailyLottoSTT.java
	src/gmb/model/tip/DailyLottoTip.java
	src/gmb/model/tip/FootballGameResult.java
	src/gmb/model/tip/PartialResult.java
	src/gmb/model/tip/SingleTip.java
	src/gmb/model/tip/TipTicket.java
	src/gmb/model/tip/TotoSTT.java
	src/gmb/model/tip/TotoTip.java
	src/gmb/model/tip/WeeklyLottoPTT.java
	src/gmb/model/tip/WeeklyLottoSTT.java
	src/gmb/model/user/Adress.java
	src/gmb/model/user/Customer.java
	src/gmb/model/user/GroupManagement.java
	src/gmb/model/user/Member.java
	src/gmb/model/user/MemberData.java
	src/gmb/model/user/MemberManagement.java

	ALSO: changed LinkedList to List
Merge pull request #2 from Bummel/master

da isser
changed DateTime to Date
changed forgotten DateTime type
logic update and MasterTest
Some important changes (addTip caused stackoverflow in tipticket),
also more MasterTest stuff
JPA - ohne init Fehler, aber noch nicht wirklich getestet
GmbPersistenceManager is aboard
Jetzt aber wirklich mit GmbPersistenceManager
Merge remote-tracking branch 'Sascha/master' into sascha_merge

Conflicts:
	src/gmb/controller/IndexController.java
	src/gmb/model/Main.java
	src/gmb/model/financial/ReceiptsDistribution.java
	src/gmb/model/financial/TipTicketPrices.java
	src/gmb/model/financial/Transaction.java
	src/gmb/model/request/ExternalTransactionRequest.java
	src/gmb/model/tip/Draw.java
	src/gmb/model/tip/FootballGameResult.java
	src/gmb/model/tip/PermaTT.java
	src/gmb/model/tip/Tip.java
	src/gmb/model/tip/TipTicket.java
	src/gmb/model/user/Group.java
	src/gmb/model/user/GroupManagement.java
	src/gmb/model/user/Member.java
	src/gmb/model/user/MemberData.java
	src/gmb/model/user/MemberManagement.java
Merge remote-tracking branch 'Sascha/master' into sascha_merge
finished merge no2
Merge pull request #4 from Bummel/master

fertiger merge No 2
The Persistence seems to be running properly.
In the class Main.java occurs a problem with the instantiation of the
Admin object, because the Member class constructor needs the Lottery to
set the current date. But the Lottery is set later. The only possibility
that I can imagine to fix this issue is to implement a setManagement 
Method for every single Management variable. So we could instantiate the
Lottery with null for every Management variable to get the Time for the
Member object and later we could set the real Managerment variables by
using the GmbPersistenceUnit.