updated login box UI
fixed java file upload
delete extra
f
Merge branch 'Update'

Conflicts:
	application/controllers/upload.php
fix config
Merge branch 'master' into Update
added insert db
code clean upload
delete text file