js compile
Merge branch 'ojai-server' of github.com:Tangerine-Community/Tangerine into ojai-server

Conflicts:
	app/_attachments/js/app.js
Merge branch 'ojai-server' of github.com:Tangerine-Community/Tangerine into ojai-server

Conflicts:
	app/_attachments/js/app.js