remove temporary images
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/temp10
	public/images/temp11
	public/images/temp30
fix ascii->utf8 uppercase conversion
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
remove some junk