timeline diaries changes
Merge branch 'master' of https://github.com/ging/smart_city_guide