kento
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/main.log
	docs/mysql.txt
kento