Merge origin/vivek

Conflicts:
	web/WEB-INF/web.xml