Fixed encoding bug. Added favorite field to ContentEntry.
Merge remote-tracking branch 'origin/master'