DiaryEntry class added
JSONResult class added and related changes in other classes
Merge remote-tracking branch 'origin/master'