scrollovani, smazani blbosti, zatim nefunkcni scrolling.
Merge master into devolop_branch
scrolling -> now it works