Start on styleguide
Merge branch 'master' into feature/styleguide
Add "blackboard" type .panel
Add paper log
Merge branch 'master' into feature/styleguide
Update game-html
Merge branch 'feature/styleguide'

Conflicts:
	html/tpl/current_selection_info/tile.html