Merge branch 'release-1.0.5' into develop
Merge branch 'release-1.0.5' into preview
Merge branch 'master' into feature/improve-common-11080
Cleans up add-on configuration.

Cleans up add-on configuration.
Merge branch 'feature/improve-common-11080' into preview
Fixes typo in setup.py
Merge branch 'feature/improve-common-11080' into preview
Fixes typo in setup.py
Updates setup url.
Merge branch 'feature/improve-common-11080' into preview
Merge branch 'feature/improve-common-11080' into develop
Update the license to get ready for 2014.
Add myself to AUTHORS.txt.
Removes z3c.autoinclude from setup.py.
Merge branch 'develop' of ssh://redmine.vnc.biz/vnccollab-common into develop
Adds portlet migration functions.
Merge branch 'feature/migrate-portlets' into preview
Merge branch 'preview' into develop
Merge branch 'develop'
convert to rst format