optimize how expandInstanceForEnv() merges datastructures
Finished rough draft of unit/func tests doc.
Made copy edits.
Fixed a link.
Fixed a link.
Made a copy edit.
add command: npm run testunit
rm a space
use node instead of ./
Merge remote-tracking branch 'upstream/develop' into npmtest

Conflicts:
	package.json
add the new command to history file
Simplified the documentation by removing many of the steps for setting up. Also, pushed the Selenium installation into the Selenium instructions.
Made copy edit.
add more commands
change doc to docs
Removed vi backup file.
Edited the testing instructions for using run.js with phantomjs.
Merge pull request #1125 from lzhan/npmtest

add command "npm run <commands>" to run unit, func, lint, docs, etc
try to improve the app/test to fix the screwdriver failure
try to improve the app/test to fix the screwdriver failure