Fix plankton and wise cirlce json
Merge remote-tracking branch 'origin/client-dev' into client-dev

Conflicts:
	client/data/project_rules.json