towards #208, fix #225, maybe #262 - implement new tooltips and text changes
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	app/views/articles/show/_inactive.html.haml