Merge remote-tracking branch 'upstream/develop' into develop
start with 1% rather than nothing
styled modals in publish step
updating chart publicUrl on api publish
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into 2.0

Conflicts:
	lib/api/charts.php