Objects for everything
Detect if can be dropped
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	js/main.js