Added title to dialog
Files that will be changeD
Fixed conflicts
Merge branch 'master' of https://github.com/getshop/FrontEnd