added spec files and user with index
user login w/ tests
deleted files
merged upstream develop with local develop
fixing merge coflicts and clearing gemlock
fixed merge conflicts and got login working