Merge pull request #37 from thehelpsf/jing-develop

Display profile and edit profile: every field except the user photo and address.
started chat ui
added chat array adapter
hooked up send button to etMessage
added styling to chat item xml
fork view on user ID
Merge pull request #38 from thehelpsf/feature/chat-ui

Feature/chat ui
Revert "Feature/chat ui"
Merge pull request #39 from thehelpsf/revert-38-feature/chat-ui

Revert "Feature/chat ui"
re-merge into develop
Merge pull request #40 from thehelpsf/feature/chat-ui

re-merge into develop
Revert to 254be242b0f33e571ee095b47cdf4f76ac750870
fixing error
fixing major merging issue
Merge pull request #41 from thehelpsf/revert-38-feature/chat-ui

Revert 38 feature/chat ui
Show modal dialog with event reminder notification comes in from Parse.
Merge branch 'refs/heads/paul-events' into develop

Conflicts:
	app/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
Fix compile error because removed one of the duplicate teal colors from colors.xml
Merge commit '224f3082f4250167bfdbd85714dc0c15d5a6b458' into jing-develop

* commit '224f3082f4250167bfdbd85714dc0c15d5a6b458':
  Fix compile error because removed one of the duplicate teal colors from colors.xml
  Show modal dialog with event reminder notification comes in from Parse.
  fixing major merging issue
  fixing error
  Revert to 254be242b0f33e571ee095b47cdf4f76ac750870
  re-merge into develop
  Revert "Feature/chat ui"
  fork view on user ID
  added styling to chat item xml
  hooked up send button to etMessage
  added chat array adapter
  started chat ui