Task #22 @5h Create form for delivery address.
Task #22 Personal page.
Task #22 @3h Create order for registered user with delivery using new form.
Task #22 @3h Create delivery and puckuo order forms.
Task #22 10m Finish delivery and pickup forms.
Task #22 @1m Remove redundand changes.
Tsk #22 @2m Add SQL queries.
Task #22 15m Fix issue with double form validation.
Task #22 @1m Fix delivery type value.
Task #22 30m Fix issue with address and personal info in email notifications.
Task #22 @15m Update admin orders list page to show delivery type.
Task #22 @90m Improve notification template. Change admin pages with orders list and order details.
Task #22 @10m Refactor OrderRepository. Display client name if email is empty in orders list.
Task #22 @5m Refactor OrderRepository
Merge branch 'master' into 22

* master:
  Task #25 @5m menu item changed
  Task #42 @30m phone in the city form
  Task #40 @30m phone number in the footer
  Task #30 @1m Fix redundand jQuery call.
  Task #30 @1h Replace city input field by select.
Merge branch '22'

* 22:
  Task #22 @5m Refactor OrderRepository
  Task #22 @10m Refactor OrderRepository. Display client name if email is empty in orders list.
  Task #22 @90m Improve notification template. Change admin pages with orders list and order details.
  Task #22 @15m Update admin orders list page to show delivery type.
  Task #22 30m Fix issue with address and personal info in email notifications.
  Task #22 @1m Fix delivery type value.
  Task #22 15m Fix issue with double form validation.
  Tsk #22 @2m Add SQL queries.
  Task #22 @1m Remove redundand changes.
  Task #22 10m Finish delivery and pickup forms.
  Task #22 @3h Create delivery and puckuo order forms.
  Task #22 @3h Create order for registered user with delivery using new form.
  Task #22 Personal page.
  Task #22 @5h Create form for delivery address.

Conflicts:
	app/views/Application/contactsmg.scala.html