Merge remote-tracking branch 'origin/frj-signin-fragment' into nb-identity-reset-password
initial reset password servlet for identity
Merge branch 'af-identity-signin-with-scala-client' into nb-identity-reset-password
merge
Merge branch 'af-identity-signin-with-scala-client' into nb-identity-reset-password
chang
Change names of form handlers to be specific
initial creation of servlet tests
committing sos i can merge
merged
Change video content queries from media to element

Update the content api client from 2.0 to 2.3
Replace uses of MediaAsset and MediaEncoding with Asset
Fix indentation and prefer collect
Update tests for new ContentApi
Protect the Content class constructor

Prefer the Content companion object for instantiation.
Replace most media asset use with content-api element

Change Images trait to Elements, to include videos. Remove assumptions and rules for finding images in media assets.
Add Element class to frontend's model.
Use Content object instead of constructor
Add tests for element model

Change Element class inheritance structure to use traits.
Update Elements trait to support test requirements.
Include body video assets in videos list.
Removed unused new auth objects
Merged in master and resolved conflicts
Merge remote-tracking branch 'origin/master' into nb-identity-reset-password