Upgrade rails to version 4
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #3 from hackd/rails4

Upgrade rails to version 4