Fix text changes and add popover
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/assets/javascripts/application.js