Redesign account merge page: https://bugzilla.redhat.com/show_bug.cgi?id=1110048
Redesign account merge page to match login page
Remove unused messages string
Re-phrase merge account messages
Merge branch 'integration/master' into rhbz1110048

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
Merge pull request #499 from zanata/rhbz1110048

Redesign account merge page