upgrade ruby to 2.1.5
Merge pull request #190 from DefactoSoftware/jurre/ruby-2.1.5

upgrade ruby to 2.1.5 (CVE-2014-8090)
upgrade rails to 4.1.7
Merge pull request #191 from DefactoSoftware/jurre/rails-4.1.7

upgrade rails to 4.1.7
Merge branch 'development'

Conflicts:
	Gemfile.lock