edit import report

import data
import form

(alien,alien_nation,offense,offenseder)
file import file
edit db 27.254.33.64
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	application/config/database.php