Created additional dialogs
Merge branch 'master' of
https://github.com/daniel-jy-he/jordersystem.git

Conflicts:
	OrderSystem/.settings/org.eclipse.core.resources.prefs