unlock rails from 3.2.9 version
update gemfile.lock for heroku
change trait value datatype to text to allow long values
message subject method attempts to choose most appropriate trait to be used as message subject
added traits enumeration to message show page
bugfix to Message.message_subject
Mergefix
Improves auto-generated rule name for new RSS Feed
Creates a user association as part of the RssFeed factory
Tests rss feed creation inbox templates
Merge branch 'master' into twitter