update
Merge branch 'master' of github.com:lshain/zim

Conflicts:
	lshain/.zim/index.db
	lshain/.zim/state.conf
update