Merge branch 'production' of github.com:seejohnrun/haste-server into production