Fixed Base64 package
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AuctionClient/src/auctionclient/service/ClientServiceImpl.java