FINISHED basic conversation page & function
UPDATED conversation, edit profile
Merge branch 'master' of github.com:josephktcheung/grasshopper into ConversationPage

RESOLVED Conflicts and FIXED bugs
FIXED conversation page bug