file upload
Merge branch 'master' of github.com:ManagementSystem/TraceCustomer

Conflicts:
	webapp/WEB-INF/jsp/index.js