Merge branch 'master' of C:\Dev\Source\CiberWeather with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/no/ciber/fragments/SearchFragment.java
Vise melding for apenes på details.