control
Merge remote-tracking branch 'origin/master'

Conflicts:
	control/select_control.php