commit for pull
Merge branch 'master' of https://github.com/william57m/projectBrowser

Conflicts:
	mainwindow.cpp
commit for pull2