update
Merge branch 'master' of https://github.com/SachaG/meteor-juice

Conflicts:
	package.js