local edit
Proto1 edit
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	war/WEB-INF/web.xml