Fixed installer

Updated changelog

Fixed bug causing duplicate buttons in visual studio toolbar

Updated version info

Updated msysgit to version 1.7.8

Warn user when trying to pull-rebase a merge commit

Merge remote-tracking branch 'jbialobr/AutoPullOnRejected'

Updated application logo for plugins

Merge remote branches 'fraga/issue/661', 'codewarrior0/refresh-commit…

…-fixes', 'codewarrior0/refresh-commit-fixes', 'fernsehkind/master' and 'jbialobr/ControlHotkeysDesignMode'

Merge remote branch 'michaellwest/issue/616'

Conflicts:
	GitUI/FormGoToCommit.Designer.cs