fix inline form alignment
Adjust transparency of unselected translations in the editor. Should fix: 1174046.
Merge branch 'master' of github.com:zanata/zanata-assets

# By Alex Eng
# Via Alex Eng
* 'master' of github.com:zanata/zanata-assets:
  Update prevent click event in dropdown
  fix whitespace visibility in codemirror: https://bugzilla.redhat.com/show_bug.cgi?id=1154881

Conflicts:
	php/6/assets/css/application.min.css
	php/6/assets/js/script.js
	php/6/assets/js/script.min.js
	php/dev/assets/css/application.min.css
	php/dev/assets/js/script.js
	php/dev/assets/js/script.min.js
	php/master/assets/css/application.min.css
	php/master/assets/js/script.js
	php/master/assets/js/script.min.js
	src/assets/css/application.min.css
	src/assets/js/script.js
	src/assets/js/script.min.js