Fix link to lokka

%s/komagata/lokka/g
Merge pull request #190 from sanemat/fix/komagata-to-lokka

Fix link to lokka
added session secret to suppress warning.
Merge pull request #192 from lokka/yagi_session_secret

added session secret to suppress warning.
update sass
Merge pull request #193 from is8r/update_sass

update sass
Update dependencies
Merge pull request #196 from wktk/update-dependencies

Update dependencies
fix broken spec in ruby 2.0.0-p195
Merge pull request #197 from 1syo/fix-broken-spec-in-2.0

Fix broken spec in ruby 2.0
Merge branch 'master' into portalshit

Conflicts:
	Gemfile
	Gemfile.lock
Upgrade ruby version