removed no longer needed placeholder
Removed unused menu items
removed redundant statement
Removed scaffolded comments
Revert "Removed openID dependency"

This reverts commit eff160b4c4474e28e113d6723859705bf42be52b.
Merge branch 'develop' into clean-controllers
fixed pavlov options
Simplified controller actions
Merge pull request #41 from eMergence-by-Design/Remove-unused-menu-items

REVIEW: Removed unused menu items
Merge pull request #43 from eMergence-by-Design/remove-image-keep

REVIEW: removed no longer needed placeholder
fixed style
Merge pull request #42 from eMergence-by-Design/clean-controllers

PENDING CI: Clean controllers
Merge branch 'develop' into my-stories

Conflicts:
	app/controllers/stories_controller.rb