Add order page

  Delivery address
  and integration into shop
Merge branch 'master' of https://github.com/bednarmart/GJA_projekt

Conflicts:
	web/shop/Shopping.jsp