Merge remote-tracking branch 'origin/category-suggestion'
Merge remote-tracking branch 'origin/german-translation'

Conflicts:
	PluginDirectories/1/CopyPath.bundle/info.json
fixed typos
Implementing first version of mehr-tanken.de
further work on gas price feature
http request fix
fixes for gasprice
Merge pull request #1 from xremix/feature-gas-price

Gas Price Feature
merge
Merge branch 'master' of https://github.com/xremix/Flashlight
add dutch support to wiki
Add ninetan.bundle
Translate to Korean
Merge pull request #159 from readingsnail/master

Translate to Korean
Plugin Translations
Merge pull request #160 from xremix/master

German Translations (and a Gas Price Plugin #155)
Merge pull request #158 from ymyzk/add-ninetan

Add Ninetan plugin
fix merge
merge korean
fail less spectacularly on os x 10.10.2