Merge branch 'master' into photo-detection

Conflicts:
	pisak/viewer/app.py
	pisak/viewer/widgets.py
refs #770
Merge branch 'master' into photo-detection

Conflicts:
	pisak/viewer/app.py
	pisak/viewer/widgets.py
refs #770
add config reader and stub config
refs #788
Merge branch 'configurator' of ssh://git.nimitz.pl/pisak into configurator
setter for config_path in configurable class
refs #788