Overwrite local deletes
remove comments from translation.json files
i18n touchup
delegate window location changes to the router
js compile
i18n touchup
add watermark to index-dev
js compile
Merge branch 'ojai-server' of github.com:Tangerine-Community/Tangerine into ojai-server

Conflicts:
	app/_attachments/js/app.js