added refresh button
Merge branch 'mauraUI' into MainUI

Conflicts:
	mainwindow.ui
worked in gitapi to support the gitmergedialog