file bug data

file bug data
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/helpers/comman_helper.php