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.
Simplified the documentation by removing many of the steps for setting up. Also, pushed the Selenium installation into the Selenium instructions.
Made copy edit.
Removed vi backup file.
Edited the testing instructions for using run.js with phantomjs.
try to improve the app/test to fix the screwdriver failure
try to improve the app/test to fix the screwdriver failure
Merge pull request #1129 from lzhan/npmtest

try to fix the failed test on screwdriver
Updated the unit/func tests with the commands for running unit and func tests with npm.
fix example app
Merge pull request #1130 from lzhan/npmtest

fix example app
Updated a couple of commands based on feedback from Lichun.
Merge branch 'develop' into docs_update_func-unit_tests
Merge pull request #1131 from zhouyaoji/docs_update_func-unit_tests

[docs] Updated instructions for running func/unit tests with commands using npm.
Merge pull request #1120 from drewfish/perf3

optimize how expandInstanceForEnv() merges datastructures