* luci-0.8: merge template changes from trunk