Align objects
Fix package.json

Not sure how that happened :(
Change test port to 9099
Behave better if a test server is already started elsewhere

- Don't try to start another server
- Don't drop the database when closing the server (this does make the
  base template tests fail, so need to exclude them)
Increase timeout for server to start
Change test port to 9099
Behave better if a test server is already started elsewhere

- Don't try to start another server
- Don't drop the database when closing the server (this does make the
  base template tests fail, so need to exclude them)
Merge branch 'master' of ../template
Modify template tests for web-media-player
Resolve media path to an absolute path (for testing)
Give the "up" link an ID (for testing)
Add tests for player webapp