Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Spanish translation.

devise.es.yml adapted from https://gist.github.com/albertopadilla/1330093
Upgraded gems by rebuilding Gemfile.lock file
Merge branch 'master' of https://github.com/atlrug-rhok/medlink
Upgraded gems by rebuilding Gemfile.lock file
Merge pull request #265 from jasnow/master

Upgraded gems by rebuilding Gemfile.lock file
Upgraded gems by rebuilding Gemfile.lock file
Adds model spec coverage for country.rb
Merge pull request #266 from jasnow/master

Upgraded 1 gem by rebuilding Gemfile.lock file
Upgraded gems by rebuilding Gemfile.lock file
Merge pull request #268 from jasnow/master

Upgraded 3 gems by rebuilding Gemfile.lock file
Merge pull request #267 from rrgayhart/model-testing

Adds model spec coverage for country.rb
Merge pull request #264 from DrDub/master

Spanish translation.
Upgraded to ruby 2.1.0
Merge pull request #269 from jasnow/master

Upgraded app to ruby 2.1.0
Update .travis.yml
Upgraded gems by rebuilding Gemfile.lock file
Upgraded gems by rebuilding Gemfile.lock file