removed protected attributes, added strong params
Merge branch 'master' of github.com:polyvision/texter

Conflicts:
	Gemfile
	app/controllers/texter/text_content_controller.rb
	app/models/texter/text_content_object.rb