corrected the name.
add secure social dependency
Adding slick. Used a placeholder model for demo.
SecureSocial stubs
Merge remote-tracking branch 'origin' into mvyas_add_securesocial_stub

Conflicts:
	build.sbt
add securesocial.conf to .gitignore
Merge remote-tracking branch 'origin/mvyas_add_securesocial_stub'
customize SecureSocial login view
added User model
fix User model. add avatarUrl as well
twitter specific OAuth2
stubs poll views/actions
make poll type temporarily Long
Added models and DAO
Merge remote-tracking branch 'origin/master' into avirmani/dao

Conflicts:
	app/models/Users.scala
pre conflicts commit
update PollsController.show with logic to render poll
rename name to hash_tag
Merge remote-tracking branch 'origin/master' into mvyas_use_user_model_in_ss

Conflicts:
	app/models/Users.scala
use timestamp instead of data for createdAt/updatedAt fields