Upgrade to Rails 4 with all tests passing
[#69806936] fix conflict
[#69806936] fix Gemfile.lock
[#69806936] fix rspec tests warnings
[#69806936] Fix ability file
[#69806936] add rack_session_access
[#69806936] add bin folder
[#69806936] update config files
Merge branch 'master' into rails4