twitter specific OAuth2
pre conflicts commit
Merge remote-tracking branch 'origin/master' into mvyas_use_user_model_in_ss

Conflicts:
	app/models/Users.scala
changes before conflicts
Merge remote-tracking branch 'origin/master' into mvyas_use_user_model_in_ss

Conflicts:
	app/models/Users.scala
Merge remote-tracking branch 'origin/master' into mvyas_use_user_model_in_ss