Removed Google Weather services
Updated CHANGES
Refactor upgrade step and add tests
Merge branch 'master' into issue_9

Conflicts:
	CHANGES.rst
	src/collective/weather/configure.zcml
Fix portlet registration and tests