Configurable portlet with header and city
Configurable weather portlet
Test add and render
Merge branch 'master' into issue_15

Conflicts:
	src/collective/weather/portlets/weather.pt
Add tests for locations vocabulary
Use more general term 'location' instead of 'city'
Updated CHANGES
Changed double by single quotes
Import from unittest2 for testing compatibility with Python 2.6
Portlet improvement
Merge branch 'issue_15' of https://github.com/collective/collective.weather into issue_15
Merge pull request #23 from collective/issue_15

implement selection of location in portlet