Updated for Rails 4
Updating some documents
Rails 4 support (merging from develop)