modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
	new file:   view/theme/smoothly/images/power.png
	new file:   view/theme/smoothly/images/up.png
Merge remote branch 'upstream/master'