Merge branch 'related-issues' of github.com:g0v/kuansim-rails into related-issues