Update gems
Merge pull request #202 from lokka/update-gems

Update gems
turn off the warning
build with 2.1.0
Merge pull request #205 from 1syo/build-2.1.0

Build with 2.1.0
Merge branch 'master' into docs.jiikko.com

Conflicts:
	Gemfile
	Gemfile.lock