story filter
Merge branch 'master' of github.com:leonko/stm

Conflicts:
	app/controllers/web/stories_controller.rb