commit for merging
Merge branch 'master' of https://github.com/zsiki/ls

Conflicts:
	surveying_util.py