rename attribute
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/templates/test1_page.html