poi
pouyuioyuiyikgkjh
Merge branch 'master' of https://github.com/Sameow/simplyTECH.git

Conflicts:
	src/simplytech/components/DesEncryption.java
	src/simplytech/dao/AnnouncementDAO.java
	src/simplytech/dao/CreditCardDAO.java
	src/simplytech/dao/CustomerVouchersDAO.java
	src/simplytech/dao/PersonDAO.java
	src/simplytech/entity/CreditCard.java
	src/simplytech/entity/Person.java
	src/simplytech/image/Hotlines.png
	src/simplytech/lobby/CreditCardPanel.java
	src/simplytech/lobby/LobbySuite.java
	src/simplytech/lobby/MainFrame.java
	src/simplytech/lobby/RegisterPanel.java
	src/simplytech/room/MyAccountsPanel.java
	src/simplytech/room/MyAccountsPanel2.java
	src/simplytech/room/MyVouchersPanel2.java
	src/simplytech/room/PointsRewardSystemPanel2.java
	src/simplytech/room/RedemptionPanel.java
	src/simplytech/room/RoomHomePagePanel.java
	src/simplytech/room/Services.java
Final