fixes, some changes...
Merge branch 'master' of https://github.com/rafal12121/diaryApp