refactor user model
user authentication testing using capybara
Merge pull request #15 from CruGlobal/THINK-166-TRN

THINK-166-TRN
Merge branch 'master' of https://github.com/CruGlobal/watchthinkchat into THINK-159-TRN

Conflicts:
	Gemfile.lock