lost icons
Merge remote-tracking branch 'origin/master'

Conflicts:
	uberPaste/src/main/webapp/images/atom.png
	uberPaste/src/main/webapp/images/ctrlc.png
	uberPaste/src/main/webapp/images/rss.png
	uberPaste/src/main/webapp/images/xml.png
Merge remote-tracking branch 'origin/master'
fixed utf8 encoding