combine 2 exact commits to clean up history

Fix edgeResolver, check for presence of resolve property before attempting to add app or common resolvers.
Merge branch 'master' of github.com:greaterweb/generator-edgeplate