merged swiping with database functionality
Merge branch 'myLayout' into layout
Merged like a pro