oauth complete
Merge branch 'oauth'

Conflicts:
	server/api/user/user.model.js
adding comma - zeke