refreshing
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/plugins/google-calendar-events/admin/add.php
	wp-content/plugins/google-calendar-events/admin/delete.php
	wp-content/plugins/google-calendar-events/admin/edit.php
	wp-content/plugins/google-calendar-events/admin/main.php
	wp-content/plugins/google-calendar-events/admin/refresh.php
	wp-content/plugins/google-calendar-events/admin/timezone-choices.php
	wp-content/plugins/google-calendar-events/css/gce-old-style.css
	wp-content/plugins/google-calendar-events/css/gce-style.css
	wp-content/plugins/google-calendar-events/google-calendar-events.php
	wp-content/plugins/google-calendar-events/inc/gce-event.php
	wp-content/plugins/google-calendar-events/inc/gce-feed.php
	wp-content/plugins/google-calendar-events/inc/gce-parser.php
	wp-content/plugins/google-calendar-events/inc/php-calendar.php
	wp-content/plugins/google-calendar-events/js/gce-admin-script.js
	wp-content/plugins/google-calendar-events/js/gce-script.js
	wp-content/plugins/google-calendar-events/license.txt
	wp-content/plugins/google-calendar-events/readme.txt
	wp-content/plugins/google-calendar-events/uninstall.php
	wp-content/plugins/google-calendar-events/widget/gce-widget.php