v 1.1 Yeti
Merge branch 'new_theme'

Conflicts:
	log/development.log