simple changes to test git merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/view/user/user.jsp