NO STAGINGgit add . fixes made to sync with sandbox
Merge pull request #1235 from pennij/working_thurs0425

NO STAGING  fixes made to sync with sandbox