Merge branch 'master' into dropboxAPI

Conflicts:
	WetteranalyseWindows/.gitignore
	WetteranalyseWindows/src/de/miktec/wetteranalyse/win/gui/ActionCommands.java
	WetteranalyseWindows/src/de/miktec/wetteranalyse/win/gui/SettingsDialog.java
	WetteranalyseWindows/src/de/miktec/wetteranalyse/win/util/DayValues.java
update