Merge branch 'develop' of github.com:jubatus/website into develop