Merge branch 'master' of ssh://ncatlab.org/home/nlab/git/test

Conflicts:
	app/models/revision.rb
	script/generate