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

Conflicts:
	application/controllers/upload.php