Add Play Auth
Add Play Auth
Ignore ensime
fixed conflicts