conflicting merge
Merge branch 'master' of github.com:phfaist/bibolamazi

Conflicts:
	gui/bibolamazi_gui.spec
moved pixmaps, small ui update
added file header comments in gui; gui helpdialog now with welcome page; small enhancements
updated gitignore and added missing file