test
Merge branch 'master' of
https://github.com/KonstantinPasternack/GiftTest.git

Conflicts:
	src/main/java/de/giftbox/daoImpl/FriendDAOImpl.java
test