show
Merge branch 'master' into showpage

Conflicts:
	app/actions.rb