updated to ruby 2.1.1
Merge branch 'master' into dev

Conflicts:
	Gemfile