update js popup canh bao
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/modules/custom/doji/doji_area/doji_area.module
	sites/default/files/bieudo/tabs.html