- Init control panel
- Minor fix
- Small refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/mysql.sql