Integration design
Integration design
remove cache
Merge
Merge origin/master

Conflicts:
	public/teapress.html