Make sure displaySolutionsButton and postUserStatistics doesn't get saved.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/cp.js
Make sure displaySolutionsButton and postUserStatistics doesn't get saved.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/cp.js
Make sure displaySolutionsButton and postUserStatistics doesn't get saved.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/cp.js