Merge origin/master

Conflicts:
	src/main/webapp/src/component/addressComponent.js