added searching of colorramps in style manager
update GUI translatio ja
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into make_pull_req_from_ja

Conflicts:
	i18n/qgis_ja.ts
update GUI translation JA
Merge pull request #687 from qgis-jp/make_pull_req_from_ja

Make pull req from ja
fTools: fix MergeShapes and SpatialJoin
fix #7823
fix #7952
fix #8206
use SVG for action icons
Merge pull request #689 from 3nids/svgactionicons

use SVG for action icons
Only cleanup python with newer sip versions (Fix #8102)
Followup f3e08b5: Actually clean python on systems with newer sip version
Fix windows build
fix editable attribute of joined fields (fix #7739)
Based on pull request 576 by minorua
more SVG icons
added folder for base SVG images (hammer, pointer, scredriver, etc.)
Merge pull request #429 from tecoholic/ramp_srch

added searching of colorramps in style manager
Bugfixing typos, thanx to Carlos Davila for pointing them out
translation update: danish by Jacob
Let python utils manage all python cleanup
translation update: es by Carlos
More const-correctness