Merge pull request #3 from WIZARD221/rails4

initial rails 4 upgrade
Merge pull request #4 from WIZARD221/rails4

gem "activeresource", "~> 4.0.0"
addes bootstrap gem
Merge branches 'master' and 'rails4' into rails4
rake rails:update:bin