add calendar feature
resolve conflicts
resolve conflicts
Merge pull request #34 from ios-class/linkai_search

Linkai search