Replace Ruby 2.1.1 with 2.1.2
Replace import code removed to leave the old method working
Updated gems
Merge branch 'master' into displays

Conflicts:
	Gemfile.lock
Updated gems