Import JSON as well as JS

We need to import login.json if it exists, so update
the makefile to match this syntax
Make `el` configurable for browse app

The browse app can now be embedded into other apps by setting the
`el`.
Merge sprint11 bug fixes

Merge remote-tracking branch 'upstream/sprint11' into sprint11