fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	pages/__init__.py