refactor move; prepare to add activity tests
Merge branch 'master' into refactorImportCalls
add extensions to menu
fix port to localhost:3000
merge upstream/master