Trivial refactor to test Travis
Merge branch 'master' into negative_shares_fix_8

Conflicts:
	public/scripts/logic.js