Fixed version dependencies in Gemfile
Merge branch 'development' of github.com:rex/server-gem into development