Update
Merge branch 'work' of github.com:graudeejs/dot.files into work

Conflicts:
	dot.workrave/state