Merge pull request #103 from eMergence-by-Design/upgrade-to-ruby-2.1

Upgrade to ruby 2.1
Merge branch 'develop' into drag-drop-stories-in-react