adding all
deleted calendarActvity
adding all
Restaurant search added
Merge conflict fixed
Fixed Compile Errors
Some corrections
adding ChordFileUploaderService
Merge branch 'master' of https://github.com/someshk/samsung-chord-hackathon
Minor changes
Removed unused file
temp changes
merging with master
merged manifest