Dalsi hratky s taktikou.
Merge origin/master

Conflicts:
	app/assets/javascripts/page/tactics/show.js
	app/assets/stylesheets/skins/default/page/tactics/show.css
	app/views/tactics/show.html.erb