resolve confilct activemodel version formup.gemspec and gemfile files refs #149
Merge branch 'refs-149'