Added bad tests results alert
Merge branch 'develop' into feature/diary
upcased words
Fixed merge conflict
Refactored on Soma, so refactored views for diary entries
Merge branch 'develop' into feature/diary
Merge branch 'feature/diary' into develop