update
Merge branch 'master' of https://github.com/Znow/wenesto

Conflicts:
	src/dk/znow/wenesto/WeatherService.java