popup + doTheRest()
Merge remote-tracking branch 'origin/master'

Conflicts:
	config-1110.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	logic-1110.js
merge doTheRest