Added assets + templates from branch master