Make lang parameter not optional
Accept lang paramter in URL for Uploads
Fix merge errors