Merged upgrade_to_v3 branch back to trunk

git-svn-id: https://plugins.svn.wordpress.org/google-calendar-widget/branches/upgrade_to_v3@1029169 b8457f37-d9ea-0310-8a92-e5e31aec5664