STS web identity
Merge branch 'Tim'
merge tim and salon changes