reinit
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf.py
	themes/clear/assets/css/main.css
	themes/clear/messages/messages_en.pyc
remove pyc pyo files