update master to latest and add ut of intraprediction in decoder

this pull request fixed the conflict of #514