Merge remote-tracking branch 'origin/frontend2'
resolving conflicts
fix modal problem
solve modal problem and add style to forms
apply styles to confirmation data
modal and flash message solved
Merge branch 'master' into backend