1
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/journal/style.css.map
Merge remote-tracking branch 'origin/master'