Merge origin/master

Conflicts:
	web/newjsp.jsp
Merge origin/master