flyway works
add assets and landscape layout view
Fix merge conflicts