.....
123
Merge branch 'directory_browser' into stage

Conflicts:
	src/image_viewerApp.cpp