Daily commit
Merge branch 'master' of https://github.com/qpiny/Solver

Conflicts:
	console/web/src/main/resources/www/console.js
Fix conflict
Daily commit