commit
commit2
Merge branch 'master' of https://github.com/donida/sinprf

Conflicts:
	src/main/webapp/WEB-INF/pages/browseFile.jsp