Resolve merge conflict.
Resolve all conflicts.
remove troubleshoot codes and in populateObjectInEditWindow() function
Resolved all conflicts.
Resolve all conflicts.
Resolve all conflicts.
Resolved all conflicts.
fix some stupid blank space and conflicts
merging from stash
save work and checkin so I can get the latest codes on Linux
try to get SmokeTest script works -- fix expandItemWidget, update selectMenuInTopRight due to app changes, fix expand4thTier, fix createPerson(), addPersonInAdminDB(), added randomlyGeneratedString, etc.  Check in from Linux so that I can checkout from my Mac to continue the work from home.
Completed troubleshooting and adding any necessary functions to make smoketest run.  Smoke test suites have been tested passed before checkin.
Merge pull request #27 from reciprocity/fixSmokeTest

Fix smoke test