Changed Gemfile to accept any Rails version
Merge branch 'master' into stable
Mergerd and fixed conflicts of Gemfile.lock from master
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'stable'