Merge pull request #1 from scrosner/sandbox

Update js - test
Merge remote-tracking branch 'origin/sandbox' into production
This is a test of committing from inside eclipse.
Merge branch 'production' of https://github.com/scrosner/mm-web.git into production

Conflicts:
	deleteme.txt
Revert "This is a test of committing from inside eclipse."

This reverts commit d5ccc8de98522c768849a5e4ca96a818e4da62e2.
Merge remote-tracking branch 'origin/sandbox' into production