remove key from logic
Merge branch 'master' of https://github.com/laertiades/comfortable-mexican-sofa

Conflicts:
	app/controllers/cms/.content_controller.rb.swp