Merge remote-tracking branch 'origin/ticket_275' into develop
Merge branch 'develop' into ticket_275

Conflicts:
	hypersocket-ui-bootstrap/src/main/resources/webapp/js/namePairInput.js