changes in car catalog module
merge conflict
payment integration done
removed conflict in style.css
schema
Merge branch 'development'