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
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
minor changes
mat changes
minor error fix
Add Family (1/3) Completed

Add One parent in family complete
Merge pull request #5 from juliard/master

Merging with Juliard
Deleted unecessary files
Merge pull request #2 from choi970242/master

Pull Request
Social Page (Part 1)
handled conflicts
hadled confilct