add wallpaper to grunt production
resolve merge conflict