1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	web/index.jsp
1