Merge branch 'master' into development
upgrading rails 4.1.0
Merge pull request #83 from dylan8902/development

upgrading rails and ruby