update rgbapng
Merge branch 'master' of https://github.com/yuanwang1980/desktop

Conflicts:
	css/style.css
bbb