Merge pull request #1 from choi970242/master

Merge please
second commit
Merge remote-tracking branch 'origin/Reyno'
Merge pull request #4 from nikobreyno/master

Merge HttpClient
Added Delete and Edit Methods
Merge remote-tracking branch 'origin/Choi'
hello
Filtered Events by child and date
config properties change
Revert "Filtered Events by child and date"

This reverts commit 44131f99631102fc17298c6245c668cc34479332.
Merge pull request #5 from nikobreyno/master

Merge Event UI
Merge pull request #1 from matmat007/Matthew

Juli pulls
fix sharing models and methods
merged with choi's latest(finished medical history)
fixed conflict
test
Event UI and Connection changes
minor changes
mat changes
minor error fix