import function added
merge with import function
Merge branch 'master' of https://github.com/awidarto/eventreg

Conflicts:
	application/views/import/import.blade.php