Added Guide Importer.
Updated copyright years.
Added Guide Importer. Updated copyright years.
Merge remote-tracking branch 'upstream/master'