Files from working edition
Merge commit '67f270990e80fac0b9ef2e77ffba53a428af5a70'

Conflicts:
	log/development.log
no message