Some mods
Added some new needed files
Modified some of the api
Merge branch 'master' into person

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Checking in person
Fix people loading