Merge frontend code into Master