Added automatic storing of username under the "user" attribute for shift objects
Merge branch 'austin'