Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM4telecom/CRM4telecom-war/web/signin.xhtml

Styles