Merge branch 'master' of /Users/ericbichara/Eric/WebstormWorkspace/OfficeSpace with conflicts.
updated dependencies