use nectar instead of client-side hummingbird
merge master and fix conflict in background.coffee