Merge branch 'master' of /Users/mattlodes/GTC-Web with conflicts.
Fixed logged in user for search and save string set