Minor fix
Add PeopleActivity and ChatActivity
Merge branch 'master' of github.com:ashishb/samsung_hackathon into ashishb
Merge branch 'master' of github.com:ashishb/samsung_hackathon into ashishb

Conflicts:
	project_x/src/com/projectx/ChatRecord.java
Merge branch 'aditya' of github.com:ashishb/samsung_hackathon into aditya
Minor merge
Merge branch 'aditya' of github.com:ashishb/samsung_hackathon into aditya
Add missing permissions to Android manifest.