Version bump with patch for ".desktop" file.
Merge branch 'pgadmin-bump' into dev

Bump pgadmin3 to 1.18.0. Add patch for .desktop file that doesn't have
deprecated keywords and adheres to the standard trailing semicolon.