BZ-13159 fixed column width
BZ-13159: Fixed modals for brandingSettings and invitations
Merge remote-tracking branch 'origin/RC20140821' into integration

Conflicts:
	src/main/js/noesis/bootstrap/common/dialog/sendInvitationsModal.html