util
Merge branch 'master' of https://github.com/JavaanseHZ/presberry.git

Conflicts:
	src/util/__init__.pyc
	src/util/state.pyc