Merge + Javadoc
Merge branch 'master' of https://github.com/ChristofTorres/eShop-Client.git