menubar add
Merge branch 'master' of https://github.com/agrippa1994/QT

Conflicts:
	MainWindow.cpp