hebrew (cont)
Merge branch 'master' of https://github.com/ypodo/prototype

Conflicts:
	app/views/users/_upload_frame.html.erb
fix